commit 7892f2f48d165a34b0b8130c8a195dfd807b8cb6
author Ingo Molnar <mingo@elte.hu> Mon Jan 09 15:59:25 2006 -0800
committer Ingo Molnar <mingo@hera.kernel.org> Mon Jan 09 15:59:25 2006 -0800
tree 592b29350c168aa5758700820ab22fb56e72a567
parent 1b1dcc1b57a49136f118a0f16367256ff9994a69

[PATCH] mutex subsystem, semaphore to mutex: VFS, sb->s_lock

This patch converts the superblock-lock semaphore to a mutex, affecting
lock_super()/unlock_super(). Tested on ext3 and XFS.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

fs/ext3/super.c

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index c3dbebd..56bf765 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2150,7 +2150,7 @@
 
 static void ext3_write_super (struct super_block * sb)
 {
-	if (down_trylock(&sb->s_lock) == 0)
+	if (mutex_trylock(&sb->s_lock) != 0)
 		BUG();
 	sb->s_dirt = 0;
 }

fs/ocfs2/super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 48bf7f0..364d64b 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -169,7 +169,7 @@
  */
 static void ocfs2_write_super(struct super_block *sb)
 {
-	if (down_trylock(&sb->s_lock) == 0)
+	if (mutex_trylock(&sb->s_lock) != 0)
 		BUG();
 	sb->s_dirt = 0;
 }

fs/super.c

diff --git a/fs/super.c b/fs/super.c
index 0a30e51..c177b92 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -72,7 +72,7 @@
 		INIT_HLIST_HEAD(&s->s_anon);
 		INIT_LIST_HEAD(&s->s_inodes);
 		init_rwsem(&s->s_umount);
-		sema_init(&s->s_lock, 1);
+		mutex_init(&s->s_lock);
 		down_write(&s->s_umount);
 		s->s_count = S_BIAS;
 		atomic_set(&s->s_active, 1);