public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-11 00:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

namei: trim redundant arguments of fs/namei.c:put_link()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-02 20:19:23 -04:00
parent 1d8e03d359
commit b9ff44293c
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fs/namei.c
View file

@ -718,12 +718,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
nd->flags |= LOOKUP_JUMPED; nd->flags |= LOOKUP_JUMPED;
} }
static inline void put_link(struct nameidata *nd, struct path *link, void *cookie) static inline void put_link(struct nameidata *nd)
{ {
struct inode *inode = link->dentry->d_inode; struct saved *last = nd->stack + nd->depth;
if (cookie && inode->i_op->put_link) struct inode *inode = last->link.dentry->d_inode;
inode->i_op->put_link(link->dentry, cookie); if (last->cookie && inode->i_op->put_link)
path_put(link); inode->i_op->put_link(last->link.dentry, last->cookie);
path_put(&last->link);
} }
int sysctl_protected_symlinks __read_mostly = 0; int sysctl_protected_symlinks __read_mostly = 0;
@ -1809,7 +1810,7 @@ Walked:
err = 0; err = 0;
if (unlikely(!s)) { if (unlikely(!s)) {
/* jumped */ /* jumped */
put_link(nd, &last->link, last->cookie); put_link(nd);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
last--; last--;
@ -1840,7 +1841,7 @@ Walked:
terminate_walk(nd); terminate_walk(nd);
Err: Err:
while (unlikely(nd->depth)) { while (unlikely(nd->depth)) {
put_link(nd, &last->link, last->cookie); put_link(nd);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
last--; last--;
@ -1850,7 +1851,7 @@ OK:
if (unlikely(nd->depth)) { if (unlikely(nd->depth)) {
name = last->name; name = last->name;
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd, &last->link, last->cookie); put_link(nd);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
last--; last--;
@ -1995,7 +1996,7 @@ static int trailing_symlink(struct nameidata *nd)
nd->inode = nd->path.dentry->d_inode; nd->inode = nd->path.dentry->d_inode;
error = link_path_walk(s, nd); error = link_path_walk(s, nd);
if (unlikely(error)) if (unlikely(error))
put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); put_link(nd);
return error; return error;
} }
@ -2036,7 +2037,7 @@ static int path_lookupat(int dfd, const struct filename *name,
if (err) if (err)
break; break;
err = lookup_last(nd); err = lookup_last(nd);
put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); put_link(nd);
} }
} }
@ -2380,7 +2381,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
if (err) if (err)
break; break;
err = mountpoint_last(nd, path); err = mountpoint_last(nd, path);
put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); put_link(nd);
} }
out: out:
path_cleanup(nd); path_cleanup(nd);
@ -3262,7 +3263,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if (unlikely(error)) if (unlikely(error))
break; break;
error = do_last(nd, file, op, &opened, pathname); error = do_last(nd, file, op, &opened, pathname);
put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); put_link(nd);
} }
out: out:
path_cleanup(nd); path_cleanup(nd);