1 files changed, 12 insertions, 5 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 92c5dae576b1..040aa879d634 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -672,16 +672,24 @@ out:
         return rc ? ERR_PTR(rc) : buf;
 }
 
-static const char *ecryptfs_follow_link(struct dentry *dentry, void **cookie)
+static const char *ecryptfs_get_link(struct dentry *dentry,
+                                     struct inode *inode,
+                                     struct delayed_call *done)
 {
         size_t len;
-        char *buf = ecryptfs_readlink_lower(dentry, &len);
+        char *buf;
+
+        if (!dentry)
+                return ERR_PTR(-ECHILD);
+
+        buf = ecryptfs_readlink_lower(dentry, &len);
         if (IS_ERR(buf))
                 return buf;
         fsstack_copy_attr_atime(d_inode(dentry),
                                 d_inode(ecryptfs_dentry_to_lower(dentry)));
         buf[len] = '\0';
-        return *cookie = buf;
+        set_delayed_call(done, kfree_link, buf);
+        return buf;
 }
 
 /**
@@ -1093,8 +1101,7 @@ out:
 
 const struct inode_operations ecryptfs_symlink_iops = {
         .readlink = generic_readlink,
-        .follow_link = ecryptfs_follow_link,
-        .put_link = kfree_put_link,
+        .get_link = ecryptfs_get_link,
         .permission = ecryptfs_permission,
         .setattr = ecryptfs_setattr,
         .getattr = ecryptfs_getattr_link,