summaryrefslogtreecommitdiff
path: root/fs/namei.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2012-06-18 10:47:03 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:35:35 +0400
commit408ef013cc9e2f94a14f7ccbbe52ddfb18437a99 (patch)
tree3168e06e8090210a59af788ca97cd40d87b5282e /fs/namei.c
parentac481d6ca4081bdd348cbd84963d1ece843a3407 (diff)
downloadlinux-3.10-408ef013cc9e2f94a14f7ccbbe52ddfb18437a99.tar.gz
linux-3.10-408ef013cc9e2f94a14f7ccbbe52ddfb18437a99.tar.bz2
linux-3.10-408ef013cc9e2f94a14f7ccbbe52ddfb18437a99.zip
fs: move path_put on failure out of ->follow_link
Currently the non-nd_set_link based versions of ->follow_link are expected to do a path_put(&nd->path) on failure. This calling convention is unexpected, undocumented and doesn't match what the nd_set_link-based instances do. Move the path_put out of the only non-nd_set_link based ->follow_link instance into the caller. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 6b29a51bef5..a9b94c62c30 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -624,7 +624,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
if (IS_ERR(*p))
- goto out_put_link;
+ goto out_put_nd_path;
error = 0;
s = nd_get_link(nd);
@@ -646,7 +646,6 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
out_put_nd_path:
path_put(&nd->path);
-out_put_link:
path_put(link);
return error;
}