| Message ID | 201710020834.AA00001@WIN-5MHF4RKU941.jp.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 02, 2017 at 05:34:12PM +0900, Tsutomu Itoh wrote: > Because the values of BTRFS_FS_QUOTA_OVERRIDE and BTRFS_FS_EXCL_OP overlap, > we should change the value. > > Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Please write a more descriptive subject and changelog. > --- > fs/btrfs/ctree.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 899ddaeeacec..566c0ba8dfb8 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -717,12 +717,11 @@ struct btrfs_delayed_root; > #define BTRFS_FS_QUOTA_OVERRIDE 14 > /* Used to record internally whether fs has been frozen */ > #define BTRFS_FS_FROZEN 15 > - Unrelated change. > /* > * Indicate that a whole-filesystem exclusive operation is running > * (device replace, resize, device add/delete, balance) > */ > -#define BTRFS_FS_EXCL_OP 14 > +#define BTRFS_FS_EXCL_OP 16 Strange how this could have got there. I was suspecting a mis-merge but the patches for number 14 went in in different releases so this actually slipped through the review. Please update and resend the patch with the following tags: Fixes: f29efe292198b ("btrfs: add quota override flag to enable quota override for CAP_SYS_RESOURCE") CC: stable@vger.kernel.org # 4.13+ -- 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
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 899ddaeeacec..566c0ba8dfb8 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -717,12 +717,11 @@ struct btrfs_delayed_root; #define BTRFS_FS_QUOTA_OVERRIDE 14 /* Used to record internally whether fs has been frozen */ #define BTRFS_FS_FROZEN 15 - /* * Indicate that a whole-filesystem exclusive operation is running * (device replace, resize, device add/delete, balance) */ -#define BTRFS_FS_EXCL_OP 14 +#define BTRFS_FS_EXCL_OP 16 struct btrfs_fs_info { u8 fsid[BTRFS_FSID_SIZE];
Because the values of BTRFS_FS_QUOTA_OVERRIDE and BTRFS_FS_EXCL_OP overlap, we should change the value. Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> --- fs/btrfs/ctree.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)