fs: Pass a folio to page_put_link()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 14 May 2025 17:13:14 +0000 (18:13 +0100)
committerChristian Brauner <brauner@kernel.org>
Thu, 15 May 2025 10:14:29 +0000 (12:14 +0200)
All callers now have a folio.  Pass it to page_put_link(), saving a
hidden call to compound_head().  Also add kernel-doc for page_get_link()
and page_put_link().

Signed-off-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Link: https://lore.kernel.org/20250514171316.3002934-4-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/fuse/dir.c
fs/namei.c
fs/nfs/symlink.c

index 83ac192e7fdd1929fa42b583c14ce75c5672e3ca..33b82529cb6e4bffa607e1b20bd09ac489b0667f 100644 (file)
@@ -1676,7 +1676,7 @@ static const char *fuse_get_link(struct dentry *dentry, struct inode *inode,
                goto out_err;
        }
 
-       set_delayed_call(callback, page_put_link, &folio->page);
+       set_delayed_call(callback, page_put_link, folio);
 
        return folio_address(folio);
 
index 7b76611d1a8c559d97c17ca35691dc185903db37..e64446be1f057a6e0e8643b879e893b08d34de4d 100644 (file)
@@ -5387,7 +5387,7 @@ static char *__page_get_link(struct dentry *dentry, struct inode *inode,
                if (IS_ERR(folio))
                        return ERR_CAST(folio);
        }
-       set_delayed_call(callback, page_put_link, &folio->page);
+       set_delayed_call(callback, page_put_link, folio);
        BUG_ON(mapping_gfp_mask(mapping) & __GFP_HIGHMEM);
        return folio_address(folio);
 }
@@ -5399,6 +5399,17 @@ const char *page_get_link_raw(struct dentry *dentry, struct inode *inode,
 }
 EXPORT_SYMBOL_GPL(page_get_link_raw);
 
+/**
+ * page_get_link() - An implementation of the get_link inode_operation.
+ * @dentry: The directory entry which is the symlink.
+ * @inode: The inode for the symlink.
+ * @callback: Used to drop the reference to the symlink.
+ *
+ * Filesystems which store their symlinks in the page cache should use
+ * this to implement the get_link() member of their inode_operations.
+ *
+ * Return: A pointer to the NUL-terminated symlink.
+ */
 const char *page_get_link(struct dentry *dentry, struct inode *inode,
                                        struct delayed_call *callback)
 {
@@ -5408,12 +5419,25 @@ const char *page_get_link(struct dentry *dentry, struct inode *inode,
                nd_terminate_link(kaddr, inode->i_size, PAGE_SIZE - 1);
        return kaddr;
 }
-
 EXPORT_SYMBOL(page_get_link);
 
+/**
+ * page_put_link() - Drop the reference to the symlink.
+ * @arg: The folio which contains the symlink.
+ *
+ * This is used internally by page_get_link().  It is exported for use
+ * by filesystems which need to implement a variant of page_get_link()
+ * themselves.  Despite the apparent symmetry, filesystems which use
+ * page_get_link() do not need to call page_put_link().
+ *
+ * The argument, while it has a void pointer type, must be a pointer to
+ * the folio which was retrieved from the page cache.  The delayed_call
+ * infrastructure is used to drop the reference count once the caller
+ * is done with the symlink.
+ */
 void page_put_link(void *arg)
 {
-       put_page(arg);
+       folio_put(arg);
 }
 EXPORT_SYMBOL(page_put_link);
 
index 004a8f6c568e32cad7057fd503aa0f390c3d2ff7..58146e9354020fc482ae2b6241c4a1fe8af63d79 100644 (file)
@@ -63,7 +63,7 @@ static const char *nfs_get_link(struct dentry *dentry,
                if (IS_ERR(folio))
                        return ERR_CAST(folio);
        }
-       set_delayed_call(done, page_put_link, &folio->page);
+       set_delayed_call(done, page_put_link, folio);
        return folio_address(folio);
 }