aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2013-04-11 06:30:16 -0400
committerJosef Bacik <jbacik@fusionio.com>2013-05-06 15:54:46 -0400
commitceda08642459e31673d24d7968d864390d2ce5fa (patch)
tree57d1a9be32a9a2653011b5fedf6615731af48b7f /fs/btrfs/disk-io.c
parentf42a34b2f10c411ef45f247f3000ed03ba4e80c0 (diff)
Btrfs: use a lock to protect incompat/compat flag of the super block
The following case will make the incompat/compat flag of the super block be recovered. Task1 |Task2 flags = btrfs_super_incompat_flags(); | |flags = btrfs_super_incompat_flags(); flags |= new_flag1; | |flags |= new_flag2; btrfs_set_super_incompat_flags(flags); | |btrfs_set_super_incompat_flags(flags); the new_flag1 is recovered. In order to avoid this problem, we introduce a lock named super_lock into the btrfs_fs_info structure. If we want to update incompat/compat flags of the super block, we must hold it. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 9f83e5b870d2..8a7a366267ec 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2086,6 +2086,7 @@ int open_ctree(struct super_block *sb,
2086 spin_lock_init(&fs_info->defrag_inodes_lock); 2086 spin_lock_init(&fs_info->defrag_inodes_lock);
2087 spin_lock_init(&fs_info->free_chunk_lock); 2087 spin_lock_init(&fs_info->free_chunk_lock);
2088 spin_lock_init(&fs_info->tree_mod_seq_lock); 2088 spin_lock_init(&fs_info->tree_mod_seq_lock);
2089 spin_lock_init(&fs_info->super_lock);
2089 rwlock_init(&fs_info->tree_mod_log_lock); 2090 rwlock_init(&fs_info->tree_mod_log_lock);
2090 mutex_init(&fs_info->reloc_mutex); 2091 mutex_init(&fs_info->reloc_mutex);
2091 seqlock_init(&fs_info->profiles_lock); 2092 seqlock_init(&fs_info->profiles_lock);
@@ -2349,6 +2350,10 @@ int open_ctree(struct super_block *sb,
2349 goto fail_alloc; 2350 goto fail_alloc;
2350 } 2351 }
2351 2352
2353 /*
2354 * Needn't use the lock because there is no other task which will
2355 * update the flag.
2356 */
2352 btrfs_set_super_incompat_flags(disk_super, features); 2357 btrfs_set_super_incompat_flags(disk_super, features);
2353 2358
2354 features = btrfs_super_compat_ro_flags(disk_super) & 2359 features = btrfs_super_compat_ro_flags(disk_super) &