[v11,15/33] mm/filemap: Add folio_offset() and folio_file_offset()

Commit Message

Matthew Wilcox (Oracle) June 14, 2021, 8:14 p.m. UTC

These are just wrappers around their page counterpart.  No change to
generated code.

Signed-off-by: Matthew Wilcox (Oracle) <[e-mail]>
Reviewed-by: Christoph Hellwig <[e-mail]>
Acked-by: Jeff Layton <[e-mail]>
Acked-by: Kirill A. Shutemov <[e-mail]>
Acked-by: Vlastimil Babka <[e-mail]>
Reviewed-by: William Kucharski <[e-mail]>
---
 include/linux/pagemap.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

David Howells June 16, 2021, 10:05 a.m. UTC | #1

Matthew Wilcox (Oracle) <[e-mail]> wrote:

> These are just wrappers around their page counterpart.  No change to
> generated code.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <[e-mail]>
> Reviewed-by: Christoph Hellwig <[e-mail]>
> Acked-by: Jeff Layton <[e-mail]>
> Acked-by: Kirill A. Shutemov <[e-mail]>
> Acked-by: Vlastimil Babka <[e-mail]>
> Reviewed-by: William Kucharski <[e-mail]>

I wonder if folio_fpos() would be better a better name than folio_offset().
"Offset" is a bit overloaded.

Reviewed-by: David Howells <[e-mail]>

Patch

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index c5c7e061c77c..42a68d15db03 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -561,6 +561,16 @@  static inline loff_t page_file_offset(struct page *page)
 	return ((loff_t)page_index(page)) << PAGE_SHIFT;
 }
 
+static inline loff_t folio_offset(struct folio *folio)
+{
+	return page_offset(&folio->page);
+}
+
+static inline loff_t folio_file_offset(struct folio *folio)
+{
+	return page_file_offset(&folio->page);
+}
+
 extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma,
 				     unsigned long address);