kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move grabbing s_umount to callers of grab_super()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-03-23 11:11:05 -04:00
parent 7ed1ee6118
commit d3f2147307
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/block_dev.c
View file

@ -245,6 +245,7 @@ struct super_block *freeze_bdev(struct block_device *bdev)
sb = get_active_super(bdev); sb = get_active_super(bdev);
if (!sb) if (!sb)
goto out; goto out;
down_write(&sb->s_umount);
if (sb->s_flags & MS_RDONLY) { if (sb->s_flags & MS_RDONLY) {
sb->s_frozen = SB_FREEZE_TRANS; sb->s_frozen = SB_FREEZE_TRANS;
up_write(&sb->s_umount); up_write(&sb->s_umount);

4
fs/super.c
View file

@ -210,7 +210,6 @@ static int grab_super(struct super_block *s) __releases(sb_lock)
{ {
if (atomic_inc_not_zero(&s->s_active)) { if (atomic_inc_not_zero(&s->s_active)) {
spin_unlock(&sb_lock); spin_unlock(&sb_lock);
down_write(&s->s_umount);
return 1; return 1;
} }
/* it's going away */ /* it's going away */
@ -317,6 +316,7 @@ retry:
up_write(&s->s_umount); up_write(&s->s_umount);
destroy_super(s); destroy_super(s);
} }
down_write(&old->s_umount);
return old; return old;
} }
} }
@ -466,7 +466,7 @@ EXPORT_SYMBOL(get_super);
* *
* Scans the superblock list and finds the superblock of the file system * Scans the superblock list and finds the superblock of the file system
* mounted on the device given. Returns the superblock with an active * mounted on the device given. Returns the superblock with an active
* reference and s_umount held exclusively or %NULL if none was found. * reference or %NULL if none was found.
*/ */
struct super_block *get_active_super(struct block_device *bdev) struct super_block *get_active_super(struct block_device *bdev)
{ {