On Fri, May 11, 2018 at 01:13:39PM -0700, Omar Sandoval wrote: > From: Omar Sandoval <osan...@fb.com> > > We got rid of BTRFS_INODE_HAS_ORPHAN_ITEM and > BTRFS_INODE_ORPHAN_META_RESERVED, so we can renumber the flags to make > them consecutive again. > > Signed-off-by: Omar Sandoval <osan...@fb.com> > --- > fs/btrfs/btrfs_inode.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h > index 4807cde0313d..bbbe7f308d68 100644 > --- a/fs/btrfs/btrfs_inode.h > +++ b/fs/btrfs/btrfs_inode.h > @@ -20,14 +20,14 @@ > * new data the application may have written before commit. > */ > #define BTRFS_INODE_ORDERED_DATA_CLOSE 0 > -#define BTRFS_INODE_DUMMY 2 > -#define BTRFS_INODE_IN_DEFRAG 3 > -#define BTRFS_INODE_HAS_ASYNC_EXTENT 5 > -#define BTRFS_INODE_NEEDS_FULL_SYNC 6 > -#define BTRFS_INODE_COPY_EVERYTHING 7 > -#define BTRFS_INODE_IN_DELALLOC_LIST 8 > -#define BTRFS_INODE_READDIO_NEED_LOCK 9 > -#define BTRFS_INODE_HAS_PROPS 10 > +#define BTRFS_INODE_DUMMY 1 > +#define BTRFS_INODE_IN_DEFRAG 2 > +#define BTRFS_INODE_HAS_ASYNC_EXTENT 3 > +#define BTRFS_INODE_NEEDS_FULL_SYNC 4 > +#define BTRFS_INODE_COPY_EVERYTHING 5 > +#define BTRFS_INODE_IN_DELALLOC_LIST 6 > +#define BTRFS_INODE_READDIO_NEED_LOCK 7 > +#define BTRFS_INODE_HAS_PROPS 8
I'll update it to something like this, as we want the auto-numbering from enums: --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -19,17 +19,19 @@ * ordered operations list so that we make sure to flush out any * * new data the application may have written before commit. */ -#define BTRFS_INODE_ORDERED_DATA_CLOSE 0 -#define BTRFS_INODE_ORPHAN_META_RESERVED 1 -#define BTRFS_INODE_DUMMY 2 -#define BTRFS_INODE_IN_DEFRAG 3 -#define BTRFS_INODE_HAS_ORPHAN_ITEM 4 -#define BTRFS_INODE_HAS_ASYNC_EXTENT 5 -#define BTRFS_INODE_NEEDS_FULL_SYNC 6 -#define BTRFS_INODE_COPY_EVERYTHING 7 -#define BTRFS_INODE_IN_DELALLOC_LIST 8 -#define BTRFS_INODE_READDIO_NEED_LOCK 9 -#define BTRFS_INODE_HAS_PROPS 10 +enum { + BTRFS_INODE_ORDERED_DATA_CLOSE = 0, + BTRFS_INODE_ORPHAN_META_RESERVED, + BTRFS_INODE_DUMMY, + BTRFS_INODE_IN_DEFRAG, + BTRFS_INODE_HAS_ORPHAN_ITEM, + BTRFS_INODE_HAS_ASYNC_EXTENT, + BTRFS_INODE_NEEDS_FULL_SYNC, + BTRFS_INODE_COPY_EVERYTHING, + BTRFS_INODE_IN_DELALLOC_LIST, + BTRFS_INODE_READDIO_NEED_LOCK, + BTRFS_INODE_HAS_PROPS, +}; -- 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