Skip to contentSkip to conversation

btrfs: convert all mount option checking code to use btrfs_test_opt

PATCH In review Satoru Takeuchi 2 participants 2 messages Sep 12, 2017 Btrfs file system

lore
Share & tools
lore

Satoru Takeuchi

author
#0 lore raw

PATCH 1/1 btrfs: convert all mount option checking code to use btrfs_test_opt

Signed-off-by Satoru Takeuchi <[email protected]>
---
 fs/btrfs/extent-tree.c | 2 +-
 fs/btrfs/super.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/extent-tree.c +1 -1
index e2d7e86..ea9b0d2 100644
@@ -652,7 +652,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
index 0b7a1d8..26f0a38 100644
@@ -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);
Signature · 1 line
2.7.4