teach proc_self_get_link()/proc_thread_self_get_link() to work in RCU mode

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/proc/self.c b/fs/proc/self.c
index 9dd0ae6aefdb09738e772d9afb65f0b21a9928dd..7a8b19ead3b65f4fd3ae612e99254029ae83c862 100644 (file)
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -25,14 +25,12 @@ static const char *proc_self_get_link(struct dentry *dentry,
        pid_t tgid = task_tgid_nr_ns(current, ns);
        char *name;
 
-       if (!dentry)
-               return ERR_PTR(-ECHILD);
        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;
 }

diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index 50eef6f3e67108c9240e5926c53c884efa1c5564..03eaa84604da98889852719d64dd7eb2b34713f5 100644 (file)
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -27,13 +27,12 @@ static const char *proc_thread_self_get_link(struct dentry *dentry,
        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);
-       if (!name)
-               return ERR_PTR(-ENOMEM);
+       name = kmalloc(PROC_NUMBUF + 6 + PROC_NUMBUF,
+                               dentry ? GFP_KERNEL : GFP_ATOMIC);
+       if (unlikely(!name))
+               return dentry ? ERR_PTR(-ENOMEM) : ERR_PTR(-ECHILD);
        sprintf(name, "%d/task/%d", tgid, pid);
        return *cookie = name;
 }