aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:27 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:19 -0500
commit621e155a3591962420eacdd39f6f0aa29ceb221e (patch)
tree387a9fb396f1bf24514b712c294182e36ba51076 /fs/proc
parentfb2d5b86aff355a27ebfc132d3c99f4a940cc3fe (diff)
fs: change d_compare for rcu-walk
Change d_compare so it may be called from lock-free RCU lookups. This does put significant restrictions on what may be done from the callback, however there don't seem to have been any problems with in-tree fses. If some strange use case pops up that _really_ cannot cope with the rcu-walk rules, we can just add new rcu-unaware callbacks, which would cause name lookup to drop out of rcu-walk mode. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/proc_sysctl.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index a256d770ea18..ae4b0fd9033f 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -397,15 +397,16 @@ static int proc_sys_delete(const struct dentry *dentry)
397 return !!PROC_I(dentry->d_inode)->sysctl->unregistering; 397 return !!PROC_I(dentry->d_inode)->sysctl->unregistering;
398} 398}
399 399
400static int proc_sys_compare(struct dentry *dir, struct qstr *qstr, 400static int proc_sys_compare(const struct dentry *parent,
401 struct qstr *name) 401 const struct inode *pinode,
402 const struct dentry *dentry, const struct inode *inode,
403 unsigned int len, const char *str, const struct qstr *name)
402{ 404{
403 struct dentry *dentry = container_of(qstr, struct dentry, d_name); 405 if (name->len != len)
404 if (qstr->len != name->len)
405 return 1; 406 return 1;
406 if (memcmp(qstr->name, name->name, name->len)) 407 if (memcmp(name->name, str, len))
407 return 1; 408 return 1;
408 return !sysctl_is_seen(PROC_I(dentry->d_inode)->sysctl); 409 return !sysctl_is_seen(PROC_I(inode)->sysctl);
409} 410}
410 411
411static const struct dentry_operations proc_sys_dentry_operations = { 412static const struct dentry_operations proc_sys_dentry_operations = {