From b827ac419721a106ae2fccaa40576b0594edad92 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 26 Oct 2023 16:37:58 -0400 Subject: exportfs: Change bcachefs fid_type enum to avoid conflicts Per Amir Goldstein, the fid types that bcachefs picked conflicted with xfs and fuse, which previously were in use but not deviced in the master enum. Since bcachefs is still out of tree, we can move. https://lore.kernel.org/linux-next/20231026203733.fx65mjyic4pka3e5@moria.home.lan/T/#ma59f65ba61f605b593e69f4690dbd317526d83ba Signed-off-by: Kent Overstreet --- include/linux/exportfs.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h index f49a7d31167e..f75e0914d40d 100644 --- a/include/linux/exportfs.h +++ b/include/linux/exportfs.h @@ -98,18 +98,18 @@ enum fid_type { */ FILEID_FAT_WITH_PARENT = 0x72, - /* - * 64 bit inode number, 32 bit subvolume, 32 bit generation number: - */ - FILEID_BCACHEFS_WITHOUT_PARENT = 0x80, - FILEID_BCACHEFS_WITH_PARENT = 0x81, - /* * 128 bit child FID (struct lu_fid) * 128 bit parent FID (struct lu_fid) */ FILEID_LUSTRE = 0x97, + /* + * 64 bit inode number, 32 bit subvolume, 32 bit generation number: + */ + FILEID_BCACHEFS_WITHOUT_PARENT = 0xb1, + FILEID_BCACHEFS_WITH_PARENT = 0xb2, + /* * 64 bit unique kernfs id */ -- cgit