Commit 68319c18 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: show rescue=usebackuproot in /proc/mounts 



The standalone option usebackuproot was intended as one-time use and it
was not necessary to keep it in the option list. Now that we're going to
have more rescue options, it's desirable to keep them intact as it could
be confusing why the option disappears.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ remove the btrfs_clear_opt part from open_ctree ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ab0b4a3e

fs/btrfs/disk-io.c

+0 −6
Original line number Diff line number Diff line
@@ -3384,12 +3384,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	}

	set_bit(BTRFS_FS_OPEN, &fs_info->flags);



	/*

	 * backuproot only affect mount behavior, and if open_ctree succeeded,

	 * no need to keep the flag

	 */

	btrfs_clear_opt(fs_info->mount_opt, USEBACKUPROOT);



	return 0;



fail_qgroup:

fs/btrfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1437,6 +1437,8 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) 
		seq_puts(seq, ",notreelog");

	if (btrfs_test_opt(info, NOLOGREPLAY))

		print_rescue_option(seq, "nologreplay", &printed);

	if (btrfs_test_opt(info, USEBACKUPROOT))

		print_rescue_option(seq, "usebackuproot", &printed);

	if (btrfs_test_opt(info, FLUSHONCOMMIT))

		seq_puts(seq, ",flushoncommit");

	if (btrfs_test_opt(info, DISCARD_SYNC))