Introduce path_put()

* Add path_put() functions for releasing a reference to the dentry and
  vfsmount of a struct path in the right order

* Switch from path_release(nd) to path_put(&nd->path)

* Rename dput_path() to path_put_conditional()

[akpm@linux-foundation.org: fix cifs]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: <linux-fsdevel@vger.kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Steven French <sfrench@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 6bc3babf6175..1b395a41a8b2 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -495,7 +495,7 @@ rpc_lookup_parent(char *path, struct nameidata *nd)
 static void
 rpc_release_path(struct nameidata *nd)
 {
-        path_release(nd);
+        path_put(&nd->path);
         rpc_put_mount();
 }
 
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 7c3323e8827b..b8788fd5e3c6 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -727,7 +727,7 @@ static struct sock *unix_find_other(struct net *net,
                 if (u->sk_type == type)
                         touch_atime(nd.path.mnt, nd.path.dentry);
 
-                path_release(&nd);
+                path_put(&nd.path);
 
                 err=-EPROTOTYPE;
                 if (u->sk_type != type) {
@@ -748,7 +748,7 @@ static struct sock *unix_find_other(struct net *net,
         return u;
 
 put_fail:
-        path_release(&nd);
+        path_put(&nd.path);
 fail:
         *error=err;
         return NULL;
@@ -862,7 +862,7 @@ out_mknod_dput:
         dput(dentry);
 out_mknod_unlock:
         mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-        path_release(&nd);
+        path_put(&nd.path);
 out_mknod_parent:
         if (err==-EEXIST)
                 err=-EADDRINUSE;