Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
nilfs2: convert nilfs_btnode_commit_change_key to use a folio
Saves one call to compound_head().
Link: https://lkml.kernel.org/r/20231114084436.2755-20-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
authored by
Matthew Wilcox (Oracle)
and committed by
Andrew Morton
c2a491f3
7c5c654c
+6
-6
+6
-6
fs/nilfs2/btnode.c
+6
-6
fs/nilfs2/btnode.c
···
238
238
{
239
239
struct buffer_head *obh = ctxt->bh, *nbh = ctxt->newbh;
240
240
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
241
-
struct page *opage;
241
+
struct folio *ofolio;
242
242
243
243
if (oldkey == newkey)
244
244
return;
245
245
246
246
if (nbh == NULL) { /* blocksize == pagesize */
247
-
opage = obh->b_page;
248
-
if (unlikely(oldkey != opage->index))
249
-
NILFS_PAGE_BUG(opage,
247
+
ofolio = obh->b_folio;
248
+
if (unlikely(oldkey != ofolio->index))
249
+
NILFS_PAGE_BUG(&ofolio->page,
250
250
"invalid oldkey %lld (newkey=%lld)",
251
251
(unsigned long long)oldkey,
252
252
(unsigned long long)newkey);
···
257
257
__xa_set_mark(&btnc->i_pages, newkey, PAGECACHE_TAG_DIRTY);
258
258
xa_unlock_irq(&btnc->i_pages);
259
259
260
-
opage->index = obh->b_blocknr = newkey;
261
-
unlock_page(opage);
260
+
ofolio->index = obh->b_blocknr = newkey;
261
+
folio_unlock(ofolio);
262
262
} else {
263
263
nilfs_copy_buffer(nbh, obh);
264
264
mark_buffer_dirty(nbh);