diff options
| author | Jan Blunck <[email protected]> | 2008-02-15 03:34:35 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-02-15 05:13:33 +0000 |
| commit | 1d957f9bf87da74f420424d16ece005202bbebd3 (patch) | |
| tree | 363d4770c0c74a536524c99ccd2762ce96ee9bbe /net/unix/af_unix.c | |
| parent | Embed a struct path into struct nameidata instead of nd->{dentry,mnt} (diff) | |
| download | kernel-1d957f9bf87da74f420424d16ece005202bbebd3.tar.gz kernel-1d957f9bf87da74f420424d16ece005202bbebd3.zip | |
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()
[[email protected]: fix cifs]
Signed-off-by: Jan Blunck <[email protected]>
Signed-off-by: Andreas Gruenbacher <[email protected]>
Acked-by: Christoph Hellwig <[email protected]>
Cc: <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Steven French <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |