aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2009-02-12 09:37:35 -0500
committerChris Mason <chris.mason@oracle.com>2009-02-12 09:37:35 -0500
commitb288052e1779261ae80138074989ef50358c4e58 (patch)
tree58c2a8e3bd4208c9b49f471f33303c88bdc20606 /fs
parenteb099670895f22970cd143875467c2768d6d87e5 (diff)
Btrfs: process mount options on mount -o remount,
Btrfs wasn't parsing any new mount options during remount, making it difficult to set mount options on a root drive. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index f3fd7e2cbc38..66b8341e2dba 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -511,6 +511,10 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
511 struct btrfs_root *root = btrfs_sb(sb); 511 struct btrfs_root *root = btrfs_sb(sb);
512 int ret; 512 int ret;
513 513
514 ret = btrfs_parse_options(root, data);
515 if (ret)
516 return -EINVAL;
517
514 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) 518 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
515 return 0; 519 return 0;
516 520