From: Anand Jain <anand.jain@oracle.com>
To: Qu Wenruo <quwenruo.btrfs@gmx.com>, linux-btrfs@vger.kernel.org
Cc: wqu@suse.com
Subject: Re: [PATCH 2/2] btrfs: add support for SUPER_FLAG_CHANGING_FSID in btrfs.ko
Date: Mon, 8 Jan 2018 13:05:27 +0800 [thread overview]
Message-ID: <50d0a4e9-04bc-5030-bbb5-1cf2cf175fee@oracle.com> (raw)
In-Reply-To: <83756e06-446f-2807-8c9a-b918f609b741@gmx.com>
On 01/08/2018 12:55 PM, Qu Wenruo wrote:
>
>
> On 2018年01月08日 11:05, Anand Jain wrote:
>> Userland uses this flag and resets it only when changing the fsid is
>> complete. Its not a good idea to mount the device anything in between,
>> so this patch fails the mount if SB SUPER_FLAG_CHANGING_FSID is set.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> cc: wqu@suse.com
>> ---
>> fs/btrfs/disk-io.c | 7 ++++++-
>> include/uapi/linux/btrfs_tree.h | 1 +
>> 2 files changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
>> index a69e5944dc08..8b76faa77235 100644
>> --- a/fs/btrfs/disk-io.c
>> +++ b/fs/btrfs/disk-io.c
>> @@ -61,7 +61,8 @@
>> BTRFS_HEADER_FLAG_RELOC |\
>> BTRFS_SUPER_FLAG_ERROR |\
>> BTRFS_SUPER_FLAG_SEEDING |\
>> - BTRFS_SUPER_FLAG_METADUMP)
>> + BTRFS_SUPER_FLAG_METADUMP |\
>> + BTRFS_SUPER_FLAG_CHANGING_FSID)
>
> If we don't want the half changed fs to be mounted, it's better not to
> include FLAG_CHANGING_FSID into BTRFS_SUPER_FLAG_SUPP.
>
>>
>> static const struct extent_io_ops btree_extent_io_ops;
>> static void end_workqueue_fn(struct btrfs_work *work);
>> @@ -3906,6 +3907,10 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info)
>> btrfs_err(fs_info, "no valid FS found");
>> ret = -EINVAL;
>> }
>> + if (btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_CHANGING_FSID) {
>
> This doesn't seems right.
>
> Shouldn't it be "btrfs_super_flags(sb) & BTRFS_SUPER_FLAG_CHANING_FSID"?
Yep. I just noticed too. Made a mistake cut and paste. Posted v2.
Thanks.
Anand
> Thanks,
> Qu
>
>> + btrfs_err(fs_info, "SUPER_FLAG_CHANGING_FSID is set");
>> + ret = -EINVAL;
>> + }
>> if (btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_SUPP)
>> btrfs_warn(fs_info, "unrecognized super flag: %llu",
>> btrfs_super_flags(sb) & ~BTRFS_SUPER_FLAG_SUPP);
>> diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
>> index 38ab0e06259a..aff1356c2bb8 100644
>> --- a/include/uapi/linux/btrfs_tree.h
>> +++ b/include/uapi/linux/btrfs_tree.h
>> @@ -457,6 +457,7 @@ struct btrfs_free_space_header {
>> #define BTRFS_SUPER_FLAG_SEEDING (1ULL << 32)
>> #define BTRFS_SUPER_FLAG_METADUMP (1ULL << 33)
>> #define BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34)
>> +#define BTRFS_SUPER_FLAG_CHANGING_FSID (1ULL << 35)
>>
>>
>> /*
>>
>
next prev parent reply other threads:[~2018-01-08 5:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 3:05 [PATCH 1/2] btrfs: add missing BTRFS_SUPER_FLAG define Anand Jain
2018-01-08 3:05 ` [PATCH 2/2] btrfs: add support for SUPER_FLAG_CHANGING_FSID in btrfs.ko Anand Jain
2018-01-08 4:55 ` Qu Wenruo
2018-01-08 5:05 ` Anand Jain [this message]
2018-01-08 5:10 ` Anand Jain
2018-01-08 5:04 ` [PATCH v2 1/2] " Anand Jain
2018-01-08 5:08 ` Qu Wenruo
2018-01-08 5:13 ` Anand Jain
2018-01-08 5:25 ` Qu Wenruo
2018-01-08 5:58 ` Anand Jain
2018-01-08 7:50 ` Qu Wenruo
2018-01-17 12:45 ` [lkp-robot] [btrfs] d1f6ad52c3: BTRFS error (device md0): SUPER_FLAG_CHANGING_FSID is set kernel test robot
2018-01-18 3:34 ` Anand Jain
2018-01-18 3:34 ` Anand Jain
2018-01-08 4:52 ` [PATCH 1/2] btrfs: add missing BTRFS_SUPER_FLAG define Qu Wenruo
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=50d0a4e9-04bc-5030-bbb5-1cf2cf175fee@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.com \
--cc=wqu@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.