1 files changed, 9 insertions, 7 deletions

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 2a8d84b727ce..e7587fce1b80 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -316,12 +316,14 @@ fail:
 }
 
 static const char *f2fs_get_link(struct dentry *dentry,
-                                 struct inode *inode, void **cookie)
+                                 struct inode *inode,
+                                 struct delayed_call *done)
 {
-        const char *link = page_get_link(dentry, inode, cookie);
+        const char *link = page_get_link(dentry, inode, done);
         if (!IS_ERR(link) && !*link) {
                 /* this is broken symlink case */
-                page_put_link(NULL, *cookie);
+                do_delayed_call(done);
+                clear_delayed_call(done);
                 link = ERR_PTR(-ENOENT);
         }
         return link;
@@ -926,7 +928,8 @@ static int f2fs_rename2(struct inode *old_dir, struct dentry *old_dentry,
 
 #ifdef CONFIG_F2FS_FS_ENCRYPTION
 static const char *f2fs_encrypted_get_link(struct dentry *dentry,
-                                           struct inode *inode, void **cookie)
+                                           struct inode *inode,
+                                           struct delayed_call *done)
 {
         struct page *cpage = NULL;
         char *caddr, *paddr = NULL;
@@ -988,7 +991,8 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,
         paddr[res] = '\0';
 
         page_cache_release(cpage);
-        return *cookie = paddr;
+        set_delayed_call(done, kfree_link, paddr);
+        return paddr;
 errout:
         kfree(cstr.name);
         f2fs_fname_crypto_free_buffer(&pstr);
@@ -999,7 +1003,6 @@ errout:
 const struct inode_operations f2fs_encrypted_symlink_inode_operations = {
         .readlink       = generic_readlink,
         .get_link       = f2fs_encrypted_get_link,
-        .put_link       = kfree_put_link,
         .getattr        = f2fs_getattr,
         .setattr        = f2fs_setattr,
         .setxattr       = generic_setxattr,
@@ -1035,7 +1038,6 @@ const struct inode_operations f2fs_dir_inode_operations = {
 const struct inode_operations f2fs_symlink_inode_operations = {
         .readlink       = generic_readlink,
         .get_link       = f2fs_get_link,
-        .put_link       = page_put_link,
         .getattr        = f2fs_getattr,
         .setattr        = f2fs_setattr,
 #ifdef CONFIG_F2FS_FS_XATTR