Commit 4849f01d authored Dec 14, 2009 by Josef Bacik Committed by Chris Mason Mar 15, 2010

Btrfs: make subvolid=0 mount the original default root

Since theres not a good way to make sure the user sees the original default root
tree id, and not to mention it's 5 so is way different than any other volume,
just make subvol=0 mount the original default root. This makes it a bit easier
for users to handle in the long run. Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

parent 6ef5ed0d

fs/btrfs/super.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -325,9 +325,15 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
		break;
		case Opt_subvolid:
		intarg = 0;
		match_int(&args[0], &intarg);
		if (intarg)
		error = match_int(&args[0], &intarg);
		if (!error) {
		/* we want the original fs_tree */
		if (!intarg)
		*subvol_objectid =
		BTRFS_FS_TREE_OBJECTID;
		else
		*subvol_objectid = intarg;
		}
		break;
		case Opt_device:
		error = btrfs_scan_one_device(match_strdup(&args[0]),