From b33aaf070f140c1a1bc214e3ba3f9b6cf769799b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 16 Apr 2012 06:44:37 +0300 Subject: [PATCH] --- yaml --- r: 299808 b: refs/heads/master c: 8a3db1849e9e2563727ea2dc32737502e0096641 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/super.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ac8bd5ef751..feee5c94a0aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37db63a400d3bac467795aa43901065fd8d903b7 +refs/heads/master: 8a3db1849e9e2563727ea2dc32737502e0096641 diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c index 84571d7da12e..43aa2dd0bc7d 100644 --- a/trunk/fs/btrfs/super.c +++ b/trunk/fs/btrfs/super.c @@ -1152,13 +1152,15 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) if (ret) goto restore; } else { - if (fs_info->fs_devices->rw_devices == 0) + if (fs_info->fs_devices->rw_devices == 0) { ret = -EACCES; goto restore; + } - if (btrfs_super_log_root(fs_info->super_copy) != 0) + if (btrfs_super_log_root(fs_info->super_copy) != 0) { ret = -EINVAL; goto restore; + } ret = btrfs_cleanup_fs_roots(fs_info); if (ret)