On Thu, Apr 19, 2012 at 01:27:38AM +0300, Sergei Trofimovich wrote:
> From: Sergei Trofimovich <slyfox@xxxxxxxxxx>
>
> Cc: Jeff Mahoney <jeffm@xxxxxxxx>
> Cc: Chris Mason <chris.mason@xxxxxxxxxx>
> Reviewed-by: Josef Bacik <josef@xxxxxxxxxx>
> Reviewed-by: Sergey V. <sftp.mtuci@xxxxxxxxx>
> Signed-off-by: Sergei Trofimovich <slyfox@xxxxxxxxxx>
> ---
> 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
>
I just noticed this doesn't have a changelog when I was putting it into
btrfs-next, can you resend with a proper changelog so I can update the one in
btrfs-next? Thanks,
Josef
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
