From: Sergei Trofimovich <slyfox@gentoo.org>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Josef Bacik <josef@redhat.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
fs/btrfs/super.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 8d5d380..0b296f2 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1149,12 +1149,16 @@ static int btrfs_remount(struct super_block *sb, int
*flags, char *data)
goto restore;
} else {
if (fs_info->fs_devices->rw_devices == 0)
+ {
ret = -EACCES;
goto restore;
+ }
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
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/16/2012 06:46 AM, Sergei Trofimovich wrote:> From: Sergei Trofimovich <slyfox@gentoo.org> > > Cc: Jeff Mahoney <jeffm@suse.com> > Cc: Chris Mason <chris.mason@oracle.com> > Cc: Josef Bacik <josef@redhat.com> > Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> > --- > fs/btrfs/super.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index 8d5d380..0b296f2 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -1149,12 +1149,16 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) > goto restore; > } else { > if (fs_info->fs_devices->rw_devices == 0) > + { > ret = -EACCES; > goto restore; > + } > > if (btrfs_super_log_root(fs_info->super_copy) != 0) > + { > ret = -EINVAL; > goto restore; > + } > > ret = btrfs_cleanup_fs_roots(fs_info); > if (ret)I prefer to if (xxx) { yyy; } thanks, liubo -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Sergei Trofimovich <slyfox@gentoo.org>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Josef Bacik <josef@redhat.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday 16 of April 2012 07:44:37 Sergei Trofimovich wrote:> From: Sergei Trofimovich <slyfox@gentoo.org> > > Cc: Jeff Mahoney <jeffm@suse.com> > Cc: Chris Mason <chris.mason@oracle.com> > Cc: Josef Bacik <josef@redhat.com> > Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> > --- > 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) > --Patch is correct Reviewed-by: Sergey V. <sftp.mtuci@gmail.com> Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 16, 2012 at 06:44:37AM +0300, Sergei Trofimovich wrote:> From: Sergei Trofimovich <slyfox@gentoo.org> > > Cc: Jeff Mahoney <jeffm@suse.com> > Cc: Chris Mason <chris.mason@oracle.com> > Cc: Josef Bacik <josef@redhat.com> > Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> > --- > 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 >Haha oops, Reviewed-by: Josef Bacik <josef@redhat.com> Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html