Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8953d69 authored by Satoru Takeuchi's avatar Satoru Takeuchi Committed by David Sterba
Browse files

btrfs: convert all mount option checking code to use btrfs_test_opt 



Signed-off-by: default avatarSatoru Takeuchi <satoru.takeuchi@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3993b112

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, 
	cache->cached = BTRFS_CACHE_FAST;

	spin_unlock(&cache->lock);



	if (fs_info->mount_opt & BTRFS_MOUNT_SPACE_CACHE) {

	if (btrfs_test_opt(fs_info, SPACE_CACHE)) {

		mutex_lock(&caching_ctl->mutex);

		ret = load_free_space_cache(fs_info, cache);

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, 
	vaf.va = &args;



	errstr = btrfs_decode_error(errno);

	if (fs_info && (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR))

	if (fs_info && (btrfs_test_opt(fs_info, PANIC_ON_FATAL_ERROR)))

		panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (errno=%d %s)\n",

			s_id, function, line, &vaf, errno, errstr);