Skip to content

Commit 60a70e6

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
mm: Use folio_next_pos()
This is one instruction more efficient than open-coding folio_pos() + folio_size(). It's the equivalent of (x + y) << z rather than x << z + y << z. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Link: https://patch.msgid.link/20251024170822.1427218-11-willy@infradead.org Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Hugh Dickins <hughd@google.com> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent ac0a111 commit 60a70e6

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

mm/shmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
11331133
same_folio = (lstart >> PAGE_SHIFT) == (lend >> PAGE_SHIFT);
11341134
folio = shmem_get_partial_folio(inode, lstart >> PAGE_SHIFT);
11351135
if (folio) {
1136-
same_folio = lend < folio_pos(folio) + folio_size(folio);
1136+
same_folio = lend < folio_next_pos(folio);
11371137
folio_mark_dirty(folio);
11381138
if (!truncate_inode_partial_folio(folio, lstart, lend)) {
11391139
start = folio_next_index(folio);

mm/truncate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
387387
same_folio = (lstart >> PAGE_SHIFT) == (lend >> PAGE_SHIFT);
388388
folio = __filemap_get_folio(mapping, lstart >> PAGE_SHIFT, FGP_LOCK, 0);
389389
if (!IS_ERR(folio)) {
390-
same_folio = lend < folio_pos(folio) + folio_size(folio);
390+
same_folio = lend < folio_next_pos(folio);
391391
if (!truncate_inode_partial_folio(folio, lstart, lend)) {
392392
start = folio_next_index(folio);
393393
if (same_folio)

0 commit comments

Comments
 (0)