diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-11-17 10:20:54 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-08 22:41:54 -0500 |
commit | 6b2553918d8b4e6de9853fd6315bec7271a2e592 (patch) | |
tree | 85540dcb0dc0de3d67c68d0aa7b17058f4e96539 /fs/proc/inode.c | |
parent | 21fc61c73c3903c4c312d0802da01ec2b323d174 (diff) |
replace ->follow_link() with new method that could stay in RCU mode
new method: ->get_link(); replacement of ->follow_link(). The differences
are:
* inode and dentry are passed separately
* might be called both in RCU and non-RCU mode;
the former is indicated by passing it a NULL dentry.
* when called that way it isn't allowed to block
and should return ERR_PTR(-ECHILD) if it needs to be called
in non-RCU mode.
It's a flagday change - the old method is gone, all in-tree instances
converted. Conversion isn't hard; said that, so far very few instances
do not immediately bail out when called in RCU mode. That'll change
in the next commits.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/inode.c')
-rw-r--r-- | fs/proc/inode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index bd95b9fdebb0..10360b268794 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
@@ -393,9 +393,10 @@ static const struct file_operations proc_reg_file_ops_no_compat = { | |||
393 | }; | 393 | }; |
394 | #endif | 394 | #endif |
395 | 395 | ||
396 | static const char *proc_follow_link(struct dentry *dentry, void **cookie) | 396 | static const char *proc_get_link(struct dentry *dentry, |
397 | struct inode *inode, void **cookie) | ||
397 | { | 398 | { |
398 | struct proc_dir_entry *pde = PDE(d_inode(dentry)); | 399 | struct proc_dir_entry *pde = PDE(inode); |
399 | if (unlikely(!use_pde(pde))) | 400 | if (unlikely(!use_pde(pde))) |
400 | return ERR_PTR(-EINVAL); | 401 | return ERR_PTR(-EINVAL); |
401 | *cookie = pde; | 402 | *cookie = pde; |
@@ -409,7 +410,7 @@ static void proc_put_link(struct inode *unused, void *p) | |||
409 | 410 | ||
410 | const struct inode_operations proc_link_inode_operations = { | 411 | const struct inode_operations proc_link_inode_operations = { |
411 | .readlink = generic_readlink, | 412 | .readlink = generic_readlink, |
412 | .follow_link = proc_follow_link, | 413 | .get_link = proc_get_link, |
413 | .put_link = proc_put_link, | 414 | .put_link = proc_put_link, |
414 | }; | 415 | }; |
415 | 416 | ||