From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 10/13] teach proc_self_get_link()/proc_thread_self_get_link() to work in RCU mode
Date: Fri, 1 Jan 2016 06:38:18 +0000 [thread overview]
Message-ID: <1451630301-30618-10-git-send-email-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20160101063624.GG9938@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/proc/self.c | 8 +++-----
fs/proc/thread_self.c | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/fs/proc/self.c b/fs/proc/self.c
index 9dd0ae6..7a8b19e 100644
--- 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 50eef6f..03eaa84 100644
--- 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;
}
--
2.1.4
next prev parent reply other threads:[~2016-01-01 6:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-01 6:36 [RFC] ->get_link(), ->put_link() and cookies Al Viro
2016-01-01 6:38 ` [PATCH 01/13] switch befs long symlinks to page_symlink_operations Al Viro
2016-01-01 6:38 ` [PATCH 02/13] logfs: don't duplicate page_symlink_inode_operations Al Viro
2016-01-01 6:38 ` [PATCH 03/13] udf: " Al Viro
2016-01-05 16:27 ` Jan Kara
2016-01-01 6:38 ` [PATCH 04/13] ufs: get rid of ->setattr() for symlinks Al Viro
2016-01-01 6:38 ` [PATCH 05/13] namei: page_getlink() and page_follow_link_light() are the same thing Al Viro
2016-01-01 6:38 ` [PATCH 06/13] don't put symlink bodies in pagecache into highmem Al Viro
2016-01-01 6:38 ` [PATCH 07/13] replace ->follow_link() with new method that could stay in RCU mode Al Viro
2016-01-01 6:38 ` [PATCH 08/13] teach page_get_link() to work " Al Viro
2016-01-01 6:38 ` [PATCH 09/13] teach shmem_get_link() " Al Viro
2016-01-01 6:38 ` Al Viro [this message]
2016-01-01 6:38 ` [PATCH 11/13] teach nfs_get_link() " Al Viro
2016-01-01 6:38 ` [PATCH 12/13] kill free_page_put_link() Al Viro
2016-01-01 6:38 ` [PATCH 13/13] switch ->get_link() to delayed_call, kill ->put_link() Al Viro
2016-01-03 19:53 ` [RFC] ->get_link(), ->put_link() and cookies Linus Torvalds
2016-01-03 20:21 ` Al Viro
2016-01-03 20:41 ` Linus Torvalds
2016-01-03 21:40 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451630301-30618-10-git-send-email-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).