On Tue, Sep 26, 2017 at 08:57:47PM +0800, Qu Wenruo wrote:
>
>
> On 2017年09月26日 16:41, Anand Jain wrote:
> > When new device is being added to seed FS, seed FS is marked writable,
> > but when we fail to bring in the new device, we missed to undo the
> > writable part. This patch fixes it.
> >
> > Signed-off-by: Anand Jain <anand.j...@oracle.com>
> > ---
> > fs/btrfs/volumes.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> > index 0e8f16c305df..9d64700cc9b6 100644
> > --- a/fs/btrfs/volumes.c
> > +++ b/fs/btrfs/volumes.c
> > @@ -2501,6 +2501,8 @@ int btrfs_init_new_device(struct btrfs_fs_info
> > *fs_info, const char *device_path
> > return ret;
> >
> > error_trans:
> > + if (seeding_dev)
> > + sb->s_flags |= MS_RDONLY;
>
> Still the same question.
>
> ---
> if (seeding_dev) {
> mutex_unlock(&uuid_mutex);
> up_write(&sb->s_umount);
>
> if (ret) /* transaction commit */
> return ret;
>
> ret = btrfs_relocate_sys_chunks(fs_info);
> if (ret < 0)
> btrfs_handle_fs_error(fs_info, ret,
> "Failed to relocate sys chunks after device
> initialization. This
> can be fixed using the \"btrfs balance\" command.");
> trans = btrfs_attach_transaction(root);
> if (IS_ERR(trans)) {
> if (PTR_ERR(trans) == -ENOENT)
> return 0;
> return PTR_ERR(trans);
> }
> ---
> In the above btrfs_attch_transaction() error handler, which just
> returned without going to error_trans tags, did we misseed the s_flag
> revert thing?
I think so. Also I think "sb->s_flags |= MS_RDONLY;" can be moved to the
'if' after the error: label, where we already check the 'seeding_dev'
condition.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
