1 files changed, 10 insertions, 8 deletions

diff --git a/fs/proc/self.c b/fs/proc/self.c
index 113b8d061fc0..67e8db442cf0 100644
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -18,26 +18,28 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
         return readlink_copy(buffer, buflen, tmp);
 }
 
-static const char *proc_self_follow_link(struct dentry *dentry, void **cookie)
+static const char *proc_self_get_link(struct dentry *dentry,
+                                      struct inode *inode,
+                                      struct delayed_call *done)
 {
-        struct pid_namespace *ns = dentry->d_sb->s_fs_info;
+        struct pid_namespace *ns = inode->i_sb->s_fs_info;
         pid_t tgid = task_tgid_nr_ns(current, ns);
         char *name;
 
         if (!tgid)
                 return ERR_PTR(-ENOENT);
         /* 11 for max length of signed int in decimal + NULL term */
-        name = kmalloc(12, GFP_KERNEL);
-        if (!name)
-                return ERR_PTR(-ENOMEM);
+        name = kmalloc(12, dentry ? GFP_KERNEL : GFP_ATOMIC);
+        if (unlikely(!name))
+                return dentry ? ERR_PTR(-ENOMEM) : ERR_PTR(-ECHILD);
         sprintf(name, "%d", tgid);
-        return *cookie = name;
+        set_delayed_call(done, kfree_link, name);
+        return name;
 }
 
 static const struct inode_operations proc_self_inode_operations = {
         .readlink       = proc_self_readlink,
-        .follow_link    = proc_self_follow_link,
-        .put_link       = kfree_put_link,
+        .get_link       = proc_self_get_link,
 };
 
 static unsigned self_inum;