aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/super.c2
-rw-r--r--fs/ocfs2/super.c2
-rw-r--r--fs/super.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index c3dbebdb9897..56bf76586019 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2150,7 +2150,7 @@ int ext3_force_commit(struct super_block *sb)
2150 2150
2151static void ext3_write_super (struct super_block * sb) 2151static void ext3_write_super (struct super_block * sb)
2152{ 2152{
2153 if (down_trylock(&sb->s_lock) == 0) 2153 if (mutex_trylock(&sb->s_lock) != 0)
2154 BUG(); 2154 BUG();
2155 sb->s_dirt = 0; 2155 sb->s_dirt = 0;
2156} 2156}
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 48bf7f0ce544..364d64bd5f10 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -169,7 +169,7 @@ static match_table_t tokens = {
169 */ 169 */
170static void ocfs2_write_super(struct super_block *sb) 170static void ocfs2_write_super(struct super_block *sb)
171{ 171{
172 if (down_trylock(&sb->s_lock) == 0) 172 if (mutex_trylock(&sb->s_lock) != 0)
173 BUG(); 173 BUG();
174 sb->s_dirt = 0; 174 sb->s_dirt = 0;
175} 175}
diff --git a/fs/super.c b/fs/super.c
index 0a30e51692cf..c177b92419c5 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -72,7 +72,7 @@ static struct super_block *alloc_super(void)
72 INIT_HLIST_HEAD(&s->s_anon); 72 INIT_HLIST_HEAD(&s->s_anon);
73 INIT_LIST_HEAD(&s->s_inodes); 73 INIT_LIST_HEAD(&s->s_inodes);
74 init_rwsem(&s->s_umount); 74 init_rwsem(&s->s_umount);
75 sema_init(&s->s_lock, 1); 75 mutex_init(&s->s_lock);
76 down_write(&s->s_umount); 76 down_write(&s->s_umount);
77 s->s_count = S_BIAS; 77 s->s_count = S_BIAS;
78 atomic_set(&s->s_active, 1); 78 atomic_set(&s->s_active, 1);