From 389b8be6ef419397e4f176652927ebad6ebb4b77 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 21 Mar 2010 22:34:11 -0400 Subject: get rid of open-coded grab_super() in get_active_super() Signed-off-by: Al Viro --- fs/super.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'fs/super.c') diff --git a/fs/super.c b/fs/super.c index 156eae5ed503..d8c8b1d2d010 100644 --- a/fs/super.c +++ b/fs/super.c @@ -487,22 +487,9 @@ struct super_block *get_active_super(struct block_device *bdev) if (sb->s_bdev != bdev) continue; - sb->s_count++; - spin_unlock(&sb_lock); - down_write(&sb->s_umount); - if (sb->s_root) { - spin_lock(&sb_lock); - if (sb->s_count > S_BIAS) { - atomic_inc(&sb->s_active); - sb->s_count--; - spin_unlock(&sb_lock); - return sb; - } - spin_unlock(&sb_lock); - } - up_write(&sb->s_umount); - put_super(sb); - yield(); + if (grab_super(sb)) /* drops sb_lock */ + return sb; + spin_lock(&sb_lock); } spin_unlock(&sb_lock); -- cgit v1.2.3-59-g8ed1b