All callers of do_follow_link() do mntget() right before it and
dput()+mntput() right after. These calls are moved inside do_follow_link()
now.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
static inline int do_follow_link(struct path *path, struct nameidata *nd)
{
int err = -ELOOP;
static inline int do_follow_link(struct path *path, struct nameidata *nd)
{
int err = -ELOOP;
if (current->link_count >= MAX_NESTED_LINKS)
goto loop;
if (current->total_link_count >= 40)
if (current->link_count >= MAX_NESTED_LINKS)
goto loop;
if (current->total_link_count >= 40)
err = __do_follow_link(path->dentry, nd);
current->link_count--;
nd->depth--;
err = __do_follow_link(path->dentry, nd);
current->link_count--;
nd->depth--;
+ dput(path->dentry);
+ mntput(path->mnt);
return err;
loop:
path_release(nd);
return err;
loop:
path_release(nd);
+ dput(path->dentry);
+ mntput(path->mnt);
goto out_dput;
if (inode->i_op->follow_link) {
goto out_dput;
if (inode->i_op->follow_link) {
err = do_follow_link(&next, nd);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
err = -ENOENT;
if (err)
goto return_err;
err = -ENOENT;
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
err = do_follow_link(&next, nd);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
inode = nd->dentry->d_inode;
if (err)
goto return_err;
inode = nd->dentry->d_inode;