(2/19)
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 <[email protected]>
----
diff -urN RC12-rc4-1/fs/namei.c RC12-rc4-2/fs/namei.c
--- RC12-rc4-1/fs/namei.c 2005-05-19 16:39:29.104704191 -0400
+++ RC12-rc4-2/fs/namei.c 2005-05-19 16:39:30.202485443 -0400
@@ -526,6 +526,7 @@
static inline int do_follow_link(struct path *path, struct nameidata *nd)
{
int err = -ELOOP;
+ mntget(path->mnt);
if (current->link_count >= MAX_NESTED_LINKS)
goto loop;
if (current->total_link_count >= 40)
@@ -541,9 +542,13 @@
err = __do_follow_link(path->dentry, nd);
current->link_count--;
nd->depth--;
+ dput(path->dentry);
+ mntput(path->mnt);
return err;
loop:
path_release(nd);
+ dput(path->dentry);
+ mntput(path->mnt);
return err;
}
@@ -783,10 +788,7 @@
goto out_dput;
if (inode->i_op->follow_link) {
- mntget(next.mnt);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
err = -ENOENT;
@@ -837,10 +839,7 @@
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
- mntget(next.mnt);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
inode = nd->dentry->d_inode;