aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-01-09 18:59:24 -0500
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 18:59:24 -0500
commit1b1dcc1b57a49136f118a0f16367256ff9994a69 (patch)
treeb0b36d4f41d28c9d6514fb309d33c1a084d6309b /net/unix/af_unix.c
parent794ee1baee1c26be40410233e6c20bceb2b03c08 (diff)
[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem
This patch converts the inode semaphore to a mutex. I have tested it on XFS and compiled as much as one can consider on an ia64. Anyway your luck with it might be different. Modified-by: Ingo Molnar <mingo@elte.hu> (finished the conversion) Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c4
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:
823out_mknod_dput: 823out_mknod_dput:
824 dput(dentry); 824 dput(dentry);
825out_mknod_unlock: 825out_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);
828out_mknod_parent: 828out_mknod_parent:
829 if (err==-EEXIST) 829 if (err==-EEXIST)