summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2013-03-20 13:21:10 +0000
committerJosef Bacik <jbacik@fusionio.com>2013-05-06 15:54:23 -0400
commit5e2a4b25da232a2f4ce264a4b2ae113d0b2a799c (patch)
tree3addd74042de37f9a29c36f345a65069b431b14a /fs/btrfs
parentc2cf52eb71aeb902682e0c1fa29e4e9e4a7f4ffc (diff)
downloadop-kernel-dev-5e2a4b25da232a2f4ce264a4b2ae113d0b2a799c.zip
op-kernel-dev-5e2a4b25da232a2f4ce264a4b2ae113d0b2a799c.tar.gz
btrfs: deprecate subvolrootid mount option
This mount option was a workaround when subvol= assumed path relative to the default subvolume, not the toplevel one. This was fixed long time ago and subvolrootid has no effect. Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/super.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 3fd4f2c..3c404b8 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -643,7 +643,7 @@ out:
*/
static int btrfs_parse_early_options(const char *options, fmode_t flags,
void *holder, char **subvol_name, u64 *subvol_objectid,
- u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
+ struct btrfs_fs_devices **fs_devices)
{
substring_t args[MAX_OPT_ARGS];
char *device_name, *opts, *orig, *p;
@@ -686,16 +686,8 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
}
break;
case Opt_subvolrootid:
- intarg = 0;
- error = match_int(&args[0], &intarg);
- if (!error) {
- /* we want the original fs_tree */
- if (!intarg)
- *subvol_rootid =
- BTRFS_FS_TREE_OBJECTID;
- else
- *subvol_rootid = intarg;
- }
+ printk(KERN_WARNING
+ "btrfs: 'subvolrootid' mount option is deprecated and has no effect\n");
break;
case Opt_device:
device_name = match_strdup(&args[0]);
@@ -1073,7 +1065,6 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
fmode_t mode = FMODE_READ;
char *subvol_name = NULL;
u64 subvol_objectid = 0;
- u64 subvol_rootid = 0;
int error = 0;
if (!(flags & MS_RDONLY))
@@ -1081,7 +1072,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
error = btrfs_parse_early_options(data, mode, fs_type,
&subvol_name, &subvol_objectid,
- &subvol_rootid, &fs_devices);
+ &fs_devices);
if (error) {
kfree(subvol_name);
return ERR_PTR(error);
OpenPOWER on IntegriCloud