[PATCH 07/13] Use path_put() in a few places instead of {mnt,d}put()

[Bharata B Rao]

From: Jan Blunck <[EMAIL PROTECTED]>

Use path_put() in a few places instead of {mnt,d}put()

Signed-off-by: Jan Blunck <[EMAIL PROTECTED]>
Signed-off-by: Andreas Gruenbacher <[EMAIL PROTECTED]>
Signed-off-by: Bharata B Rao <[EMAIL PROTECTED]>
Acked-by: Christoph Hellwig <[EMAIL PROTECTED]>
---
 fs/afs/mntpt.c |3 +--
 fs/namei.c |   15 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -235,8 +235,7 @@ static void *afs_mntpt_follow_link(struc
err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, _vfsmounts);
switch (err) {
case 0:
-   dput(nd->path.dentry);
-   mntput(nd->path.mnt);
+   path_put(>path);
nd->path.mnt = newmnt;
nd->path.dentry = dget(newmnt->mnt_root);
schedule_delayed_work(_mntpt_expiry_timer,
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -626,8 +626,7 @@ static __always_inline int __do_follow_l
if (dentry->d_inode->i_op->put_link)
dentry->d_inode->i_op->put_link(dentry, nd, cookie);
}
-   dput(dentry);
-   mntput(path->mnt);
+   path_put(path);
 
return error;
 }
@@ -1034,8 +1033,7 @@ static int fastcall link_path_walk(const
result = __link_path_walk(name, nd);
}
 
-   dput(save.path.dentry);
-   mntput(save.path.mnt);
+   path_put();
 
return result;
 }
@@ -1057,8 +1055,7 @@ static int __emul_lookup_dentry(const ch
 
if (!nd->path.dentry->d_inode ||
S_ISDIR(nd->path.dentry->d_inode->i_mode)) {
-   struct dentry *old_dentry = nd->path.dentry;
-   struct vfsmount *old_mnt = nd->path.mnt;
+   struct path old_path = nd->path;
struct qstr last = nd->last;
int last_type = nd->last_type;
struct fs_struct *fs = current->fs;
@@ -1074,14 +1071,12 @@ static int __emul_lookup_dentry(const ch
read_unlock(>lock);
if (path_walk(name, nd) == 0) {
if (nd->path.dentry->d_inode) {
-   dput(old_dentry);
-   mntput(old_mnt);
+   path_put(_path);
return 1;
}
path_put(>path);
}
-   nd->path.dentry = old_dentry;
-   nd->path.mnt = old_mnt;
+   nd->path = old_path;
nd->last = last;
nd->last_type = last_type;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 07/13] Use path_put() in a few places instead of {mnt,d}put()

[Bharata B Rao]

From: Jan Blunck [EMAIL PROTECTED]

Use path_put() in a few places instead of {mnt,d}put()

Signed-off-by: Jan Blunck [EMAIL PROTECTED]
Signed-off-by: Andreas Gruenbacher [EMAIL PROTECTED]
Signed-off-by: Bharata B Rao [EMAIL PROTECTED]
Acked-by: Christoph Hellwig [EMAIL PROTECTED]
---
 fs/afs/mntpt.c |3 +--
 fs/namei.c |   15 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -235,8 +235,7 @@ static void *afs_mntpt_follow_link(struc
err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, afs_vfsmounts);
switch (err) {
case 0:
-   dput(nd-path.dentry);
-   mntput(nd-path.mnt);
+   path_put(nd-path);
nd-path.mnt = newmnt;
nd-path.dentry = dget(newmnt-mnt_root);
schedule_delayed_work(afs_mntpt_expiry_timer,
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -626,8 +626,7 @@ static __always_inline int __do_follow_l
if (dentry-d_inode-i_op-put_link)
dentry-d_inode-i_op-put_link(dentry, nd, cookie);
}
-   dput(dentry);
-   mntput(path-mnt);
+   path_put(path);
 
return error;
 }
@@ -1034,8 +1033,7 @@ static int fastcall link_path_walk(const
result = __link_path_walk(name, nd);
}
 
-   dput(save.path.dentry);
-   mntput(save.path.mnt);
+   path_put(save.path);
 
return result;
 }
@@ -1057,8 +1055,7 @@ static int __emul_lookup_dentry(const ch
 
if (!nd-path.dentry-d_inode ||
S_ISDIR(nd-path.dentry-d_inode-i_mode)) {
-   struct dentry *old_dentry = nd-path.dentry;
-   struct vfsmount *old_mnt = nd-path.mnt;
+   struct path old_path = nd-path;
struct qstr last = nd-last;
int last_type = nd-last_type;
struct fs_struct *fs = current-fs;
@@ -1074,14 +1071,12 @@ static int __emul_lookup_dentry(const ch
read_unlock(fs-lock);
if (path_walk(name, nd) == 0) {
if (nd-path.dentry-d_inode) {
-   dput(old_dentry);
-   mntput(old_mnt);
+   path_put(old_path);
return 1;
}
path_put(nd-path);
}
-   nd-path.dentry = old_dentry;
-   nd-path.mnt = old_mnt;
+   nd-path = old_path;
nd-last = last;
nd-last_type = last_type;
}
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/