diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
| commit | 80c0531514516e43ae118ddf38424e06e5c3cb3c (patch) | |
| tree | 2eef8cf8fdf505b18f83078d1eb41167e98f5b54 /net/unix | |
| parent | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (diff) | |
| parent | 11b751ae8c8ca3fa24c85bd5a3e51dd9f95cda17 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 5f6ae79b8b16..1b5989b1b670 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -784,7 +784,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
| 784 | err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); | 784 | err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0); |
| 785 | if (err) | 785 | if (err) |
| 786 | goto out_mknod_dput; | 786 | goto out_mknod_dput; |
| 787 | up(&nd.dentry->d_inode->i_sem); | 787 | mutex_unlock(&nd.dentry->d_inode->i_mutex); |
| 788 | dput(nd.dentry); | 788 | dput(nd.dentry); |
| 789 | nd.dentry = dentry; | 789 | nd.dentry = dentry; |
| 790 | 790 | ||
| @@ -823,7 +823,7 @@ out: | |||
| 823 | out_mknod_dput: | 823 | out_mknod_dput: |
| 824 | dput(dentry); | 824 | dput(dentry); |
| 825 | out_mknod_unlock: | 825 | out_mknod_unlock: |
| 826 | up(&nd.dentry->d_inode->i_sem); | 826 | mutex_unlock(&nd.dentry->d_inode->i_mutex); |
| 827 | path_release(&nd); | 827 | path_release(&nd); |
| 828 | out_mknod_parent: | 828 | out_mknod_parent: |
| 829 | if (err==-EEXIST) | 829 | if (err==-EEXIST) |