Skip to contentSkip to conversation

Btrfs: add missing mounting options in btrfs_show_options()

PATCH Superseded Wang Shilong 2 participants 3 messages Jul 23, 2013 Btrfs file system

lore
Share & tools
lore

Wang Shilong

author
#0 lore raw

PATCH 3/3 Btrfs: add missing mounting options in btrfs_show_options()

Some options are missing in btrfs_show_options(), this patch adds them.

Signed-off-by Wang Shilong<[email protected]>
Reviewed-by Miao Xie<[email protected]>
---
 fs/btrfs/super.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
fs/btrfs/super.c +14 -0
index d82391d..fa57418 100644
@@ -965,6 +965,20 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
 		seq_puts(seq, ",inode_cache");
 	if (btrfs_test_opt(root, SKIP_BALANCE))
 		seq_puts(seq, ",skip_balance");
+	if (btrfs_test_opt(root, RECOVERY))
+		seq_puts(seq, ",auto_recovery");
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+	if (btrfs_test_opt(root, CHECK_INTEGRITY_INCLUDING_EXTENT_DATA))
+		seq_puts(seq, ",check_int_data");
+	else if (btrfs_test_opt(root, CHECK_INTEGRITY))
+		seq_puts(seq, ",check_int");
+	if (info->check_integrity_print_mask)
+		seq_printf(seq, ",check_int_print_mask=%d",
+				info->check_integrity_print_mask);
+#endif
+	if (info->metadata_ratio)
+		seq_printf(seq, ",metadata_ratio=%d",
+				info->metadata_ratio);
 	if (btrfs_test_opt(root, PANIC_ON_FATAL_ERROR))
 		seq_puts(seq, ",fatal_errors=panic");
 	return 0;

-- 1.8.0.1

#1 lore raw

fs/btrfs/super.c static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) · line 969

Quoted 2 lines · Wang Shilong
fs/btrfs/super.c +2 -0
+    if (btrfs_test_opt(root, RECOVERY))
+        seq_puts(seq, ",auto_recovery");

"recovery" without the "auto_".

author
#2 lore raw
Quoted 4 lines · Stefan Behrens

fs/btrfs/super.c static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) · line 969

Quoted 2 lines · Wang Shilong
fs/btrfs/super.c +2 -0
+    if (btrfs_test_opt(root, RECOVERY))
+        seq_puts(seq, ",auto_recovery");

"recovery" without the "auto_"

Thanks, i will update the patch ^_^

Wang,

Quoted 2 lines