From: Josef Bacik <josef@redhat.com>
To: Sergei Trofimovich <slyich@gmail.com>
Cc: linux-btrfs@vger.kernel.org,
Sergei Trofimovich <slyfox@gentoo.org>,
Jeff Mahoney <jeffm@suse.com>,
Chris Mason <chris.mason@oracle.com>
Subject: Re: [PATCH v3] btrfs: fix early abort in 'remount'
Date: Fri, 20 Apr 2012 17:27:50 -0400 [thread overview]
Message-ID: <20120420212750.GF1957@localhost.localdomain> (raw)
In-Reply-To: <1334788058-435-1-git-send-email-slyich@gmail.com>
On Thu, Apr 19, 2012 at 01:27:38AM +0300, Sergei Trofimovich wrote:
> From: Sergei Trofimovich <slyfox@gentoo.org>
>
> Cc: Jeff Mahoney <jeffm@suse.com>
> Cc: Chris Mason <chris.mason@oracle.com>
> Reviewed-by: Josef Bacik <josef@redhat.com>
> Reviewed-by: Sergey V. <sftp.mtuci@gmail.com>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
> 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
next prev parent reply other threads:[~2012-04-20 21:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-18 22:27 [PATCH v3] btrfs: fix early abort in 'remount' Sergei Trofimovich
2012-04-18 22:28 ` Jeff Mahoney
2012-04-20 21:27 ` Josef Bacik [this message]
2012-04-21 8:27 ` [PATCH v4] " Sergei Trofimovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120420212750.GF1957@localhost.localdomain \
--to=josef@redhat.com \
--cc=chris.mason@oracle.com \
--cc=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=slyfox@gentoo.org \
--cc=slyich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).