aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-05-05 22:10:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-11 21:36:07 -0400
commita9e220f8322e2b0e0b8903fe00265461cffad3f0 (patch)
treeb3be7d58b8eb9fd810636223f0458191ec1b9d75 /fs
parent62c6943b4b1e818aea60c11c5a68a50785b83119 (diff)
No need to do lock_super() for exclusion in generic_shutdown_super()
We can't run into contention on it. All other callers of lock_super() either hold s_umount (and we have it exclusive) or hold an active reference to superblock in question, which prevents the call of generic_shutdown_super() while the reference is held. So we can replace lock_super(s) with get_fs_excl() in generic_shutdown_super() (and corresponding change for unlock_super(), of course). Since ext4 expects s_lock held for its put_super, take lock_super() into it. The rest of filesystems do not care at all. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c2
-rw-r--r--fs/super.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index c7b8f8d9b7a8..0d3034c5e8a4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -576,6 +576,7 @@ static void ext4_put_super(struct super_block *sb)
576 struct ext4_super_block *es = sbi->s_es; 576 struct ext4_super_block *es = sbi->s_es;
577 int i, err; 577 int i, err;
578 578
579 lock_super(sb);
579 if (sb->s_dirt) 580 if (sb->s_dirt)
580 ext4_write_super(sb); 581 ext4_write_super(sb);
581 582
@@ -645,7 +646,6 @@ static void ext4_put_super(struct super_block *sb)
645 unlock_super(sb); 646 unlock_super(sb);
646 kobject_put(&sbi->s_kobj); 647 kobject_put(&sbi->s_kobj);
647 wait_for_completion(&sbi->s_kobj_unregister); 648 wait_for_completion(&sbi->s_kobj_unregister);
648 lock_super(sb);
649 lock_kernel(); 649 lock_kernel();
650 kfree(sbi->s_blockgroup_lock); 650 kfree(sbi->s_blockgroup_lock);
651 kfree(sbi); 651 kfree(sbi);
diff --git a/fs/super.c b/fs/super.c
index 49f670cb9a83..54fd331f0cab 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -304,7 +304,7 @@ void generic_shutdown_super(struct super_block *sb)
304 if (sb->s_root) { 304 if (sb->s_root) {
305 shrink_dcache_for_umount(sb); 305 shrink_dcache_for_umount(sb);
306 sync_filesystem(sb); 306 sync_filesystem(sb);
307 lock_super(sb); 307 get_fs_excl();
308 sb->s_flags &= ~MS_ACTIVE; 308 sb->s_flags &= ~MS_ACTIVE;
309 309
310 /* bad name - it should be evict_inodes() */ 310 /* bad name - it should be evict_inodes() */
@@ -322,7 +322,7 @@ void generic_shutdown_super(struct super_block *sb)
322 } 322 }
323 323
324 unlock_kernel(); 324 unlock_kernel();
325 unlock_super(sb); 325 put_fs_excl();
326 } 326 }
327 spin_lock(&sb_lock); 327 spin_lock(&sb_lock);
328 /* should be initialized for __put_super_and_need_restart() */ 328 /* should be initialized for __put_super_and_need_restart() */