diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-17 01:29:09 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-08 19:33:23 -0500 |
| commit | 6de1d09d9677dce7a04ef485d426821159ab7de9 (patch) | |
| tree | e906ecf66e13f5827df4a4c34adb327a45a73542 /fs | |
| parent | aea52e19dd2085617dd7d247afb76a90cf2ea40c (diff) | |
| download | linux-stable-6de1d09d9677dce7a04ef485d426821159ab7de9.tar.gz linux-stable-6de1d09d9677dce7a04ef485d426821159ab7de9.tar.bz2 linux-stable-6de1d09d9677dce7a04ef485d426821159ab7de9.zip | |
btrfs: fix mount/umount race
Do *NOT* skip doomed superblocks in btrfs_test_super(); we want
sget() to wait for their shutdown to complete. Since we don't
mutilate ->s_fs_info in ->put_super() anymore (or free what it
used to point to until the superblock is past being findable
by sget()), we can just DTRT there and report a match.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index eca48624a4f0..b9fd62a0fca2 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -733,20 +733,15 @@ static int btrfs_test_super(struct super_block *s, void *data) struct btrfs_root *test_root = data; struct btrfs_root *root = btrfs_sb(s); - /* - * If this super block is going away, return false as it - * can't match as an existing super block. - */ - if (!atomic_read(&s->s_active)) - return 0; return root->fs_info->fs_devices == test_root->fs_info->fs_devices; } static int btrfs_set_super(struct super_block *s, void *data) { - s->s_fs_info = data; - - return set_anon_super(s, data); + int err = set_anon_super(s, data); + if (!err) + s->s_fs_info = data; + return err; } /* |