redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

btrfs: allow scanning multiple devices during mount

Browse source 
Allows to specify one or multiple device=/dev/foo options during mount
so that ioctls on the control device can be avoided.  Especially useful
when trying to mount a multi-device setup as root.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Christoph Hellwig 2008-06-10 10:40:46 -04:00 committed by Chris Mason
parent edf24abe51
commit 43e570b08a
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/btrfs/super.c
View file

@ -65,7 +65,7 @@ static void btrfs_put_super (struct super_block * sb)
} }
enum { enum {
Opt_degraded, Opt_subvol, Opt_nodatasum, Opt_nodatacow, Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow,
Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier,
Opt_ssd, Opt_err, Opt_ssd, Opt_err,
}; };
@ -73,6 +73,7 @@ enum {
static match_table_t tokens = { static match_table_t tokens = {
{Opt_degraded, "degraded"}, {Opt_degraded, "degraded"},
{Opt_subvol, "subvol=%s"}, {Opt_subvol, "subvol=%s"},
{Opt_device, "device=%s"},
{Opt_nodatasum, "nodatasum"}, {Opt_nodatasum, "nodatasum"},
{Opt_nodatacow, "nodatacow"}, {Opt_nodatacow, "nodatacow"},
{Opt_nobarrier, "nobarrier"}, {Opt_nobarrier, "nobarrier"},
@ -142,8 +143,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
btrfs_set_opt(info->mount_opt, DEGRADED); btrfs_set_opt(info->mount_opt, DEGRADED);
break; break;
case Opt_subvol: case Opt_subvol:
case Opt_device:
/* /*
* This one is parsed by btrfs_parse_early_options * These are parsed by btrfs_parse_early_options
* and can be happily ignored here. * and can be happily ignored here.
*/ */
break; break;
@ -212,8 +214,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
* All other options will be parsed on much later in the mount process and * All other options will be parsed on much later in the mount process and
* only when we need to allocate a new super block. * only when we need to allocate a new super block.
*/ */
static int btrfs_parse_early_options(const char *options, static int btrfs_parse_early_options(const char *options, int flags,
char **subvol_name) void *holder, char **subvol_name,
struct btrfs_fs_devices **fs_devices)
{ {
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
char *opts, *p; char *opts, *p;
@ -240,11 +243,18 @@ static int btrfs_parse_early_options(const char *options,
case Opt_subvol: case Opt_subvol:
*subvol_name = match_strdup(&args[0]); *subvol_name = match_strdup(&args[0]);
break; break;
case Opt_device:
error = btrfs_scan_one_device(match_strdup(&args[0]),
flags, holder, fs_devices);
if (error)
goto out_free_opts;
break;
default: default:
break; break;
} }
} }
out_free_opts:
kfree(opts); kfree(opts);
out: out:
/* /*
@ -380,7 +390,8 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
struct btrfs_fs_devices *fs_devices = NULL; struct btrfs_fs_devices *fs_devices = NULL;
int error = 0; int error = 0;
error = btrfs_parse_early_options(data, &subvol_name); error = btrfs_parse_early_options(data, flags, fs_type,
&subvol_name, &fs_devices);
if (error) if (error)
goto error; goto error;