replace ->follow_link() with new method that could stay in RCU mode

[mirror_ubuntu-artful-kernel.git] / fs / proc / thread_self.c

diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index 947b0f4fd0a194057334762bafeff3548c276568..50eef6f3e67108c9240e5926c53c884efa1c5564 100644 (file)
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -19,13 +19,16 @@ static int proc_thread_self_readlink(struct dentry *dentry, char __user *buffer,
        return readlink_copy(buffer, buflen, tmp);
 }
 
-static const char *proc_thread_self_follow_link(struct dentry *dentry, void **cookie)
+static const char *proc_thread_self_get_link(struct dentry *dentry,
+                                            struct inode *inode, void **cookie)
 {
-       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);
        pid_t pid = task_pid_nr_ns(current, ns);
        char *name;
 
+       if (!dentry)
+               return ERR_PTR(-ECHILD);
        if (!pid)
                return ERR_PTR(-ENOENT);
        name = kmalloc(PROC_NUMBUF + 6 + PROC_NUMBUF, GFP_KERNEL);
@@ -37,7 +40,7 @@ static const char *proc_thread_self_follow_link(struct dentry *dentry, void **co
 
 static const struct inode_operations proc_thread_self_inode_operations = {
        .readlink       = proc_thread_self_readlink,
-       .follow_link    = proc_thread_self_follow_link,
+       .get_link       = proc_thread_self_get_link,
        .put_link       = kfree_put_link,
 };