From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Trofimovich Subject: [PATCH v3] btrfs: fix early abort in 'remount' Date: Thu, 19 Apr 2012 01:27:38 +0300 Message-ID: <1334788058-435-1-git-send-email-slyich@gmail.com> Cc: Sergei Trofimovich , Jeff Mahoney , Chris Mason To: linux-btrfs@vger.kernel.org Return-path: List-ID: From: Sergei Trofimovich Cc: Jeff Mahoney Cc: Chris Mason Reviewed-by: Josef Bacik Reviewed-by: Sergey V. Signed-off-by: Sergei Trofimovich --- v1->v2: fixed indentation of 'if (cond) {' suggested by Liu Bo v2->v3: added 'Reviewed-by' fs/btrfs/super.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8d5d380..2f28fc0 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1148,13 +1148,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) -- 1.7.8.5