[f2fs-dev] [PATCH 1/1] errno.h: Provide EFSBADCRC for everybody
Four filesystems have their own defines for this. Move it into errno.h so it's defined in just one place. Signed-off-by: Valdis Kletnieks --- fs/ext4/ext4.h | 2 -- fs/f2fs/f2fs.h | 2 -- fs/xfs/xfs_linux.h | 1 - include/linux/jbd2.h | 2 -- include/uapi/asm-generic/errno.h | 1 + 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a86c2585457d..79b3fd8291ab 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3395,6 +3395,4 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh) #endif /* __KERNEL__ */ -#define EFSBADCRC EBADMSG /* Bad CRC detected */ - #endif /* _EXT4_H */ diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 04ebe77569a3..ba23fd18d44a 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3751,6 +3751,4 @@ static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) return false; } -#define EFSBADCRC EBADMSG /* Bad CRC detected */ - #endif /* _LINUX_F2FS_H */ diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 3409d02a7d21..abdfc506618d 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -123,7 +123,6 @@ typedef __u32 xfs_nlink_t; #define ENOATTRENODATA /* Attribute not found */ #define EWRONGFS EINVAL /* Mount with wrong filesystem type */ -#define EFSBADCRC EBADMSG /* Bad CRC detected */ #define SYNCHRONIZE() barrier() #define __return_address __builtin_return_address(0) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 69411d7e0431..e07692fe6f20 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1656,6 +1656,4 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal) #endif /* __KERNEL__ */ -#define EFSBADCRC EBADMSG /* Bad CRC detected */ - #endif /* _LINUX_JBD2_H */ diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h index 1d5ffdf54cb0..e4cae9a9ae79 100644 --- a/include/uapi/asm-generic/errno.h +++ b/include/uapi/asm-generic/errno.h @@ -55,6 +55,7 @@ #defineEMULTIHOP 72 /* Multihop attempted */ #defineEDOTDOT 73 /* RFS specific error */ #defineEBADMSG 74 /* Not a data message */ +#define EFSBADCRC EBADMSG /* Bad CRC detected */ #defineEOVERFLOW 75 /* Value too large for defined data type */ #defineENOTUNIQ76 /* Name not unique on network */ #defineEBADFD 77 /* File descriptor in bad state */ -- 2.24.0.rc1 ___ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] [PATCH 10/10] errno.h: Provide EFSCORRUPTED for everybody
There's currently 6 filesystems that have the same #define. Move it into errno.h so it's defined in just one place. Signed-off-by: Valdis Kletnieks Acked-by: Darrick J. Wong Reviewed-by: Jan Kara Acked-by: Theodore Ts'o --- drivers/staging/exfat/exfat.h| 2 -- fs/erofs/internal.h | 2 -- fs/ext4/ext4.h | 1 - fs/f2fs/f2fs.h | 1 - fs/xfs/xfs_linux.h | 1 - include/linux/jbd2.h | 1 - include/uapi/asm-generic/errno.h | 1 + 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index 72cf40e123de..58b091a077e8 100644 --- a/drivers/staging/exfat/exfat.h +++ b/drivers/staging/exfat/exfat.h @@ -30,8 +30,6 @@ #undef DEBUG #endif -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ - #define DENTRY_SIZE32 /* dir entry size */ #define DENTRY_SIZE_BITS 5 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 544a453f3076..3980026a8882 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -425,7 +425,5 @@ static inline int z_erofs_init_zip_subsystem(void) { return 0; } static inline void z_erofs_exit_zip_subsystem(void) {} #endif /* !CONFIG_EROFS_FS_ZIP */ -#define EFSCORRUPTEDEUCLEAN /* Filesystem is corrupted */ - #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 03db3e71676c..a86c2585457d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3396,6 +3396,5 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh) #endif /* __KERNEL__ */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _EXT4_H */ diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4024790028aa..04ebe77569a3 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3752,6 +3752,5 @@ static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) } #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _LINUX_F2FS_H */ diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index ca15105681ca..3409d02a7d21 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -123,7 +123,6 @@ typedef __u32 xfs_nlink_t; #define ENOATTRENODATA /* Attribute not found */ #define EWRONGFS EINVAL /* Mount with wrong filesystem type */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ #define SYNCHRONIZE() barrier() diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 603fbc4e2f70..69411d7e0431 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1657,6 +1657,5 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal) #endif /* __KERNEL__ */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _LINUX_JBD2_H */ diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h index cf9c51ac49f9..1d5ffdf54cb0 100644 --- a/include/uapi/asm-generic/errno.h +++ b/include/uapi/asm-generic/errno.h @@ -98,6 +98,7 @@ #defineEINPROGRESS 115 /* Operation now in progress */ #defineESTALE 116 /* Stale file handle */ #defineEUCLEAN 117 /* Structure needs cleaning */ +#defineEFSCORRUPTEDEUCLEAN #defineENOTNAM 118 /* Not a XENIX named type file */ #defineENAVAIL 119 /* No XENIX semaphores available */ #defineEISNAM 120 /* Is a named type file */ -- 2.24.0.rc1 ___ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
[f2fs-dev] [RFC] errno.h: Provide EFSCORRUPTED for everybody
Three questions: (a) ACK/NAK on this patch, (b) should it be all in one patch, or one to add to errno.h and 6 patches for 6 filesystems?), and (c) if one patch, who gets to shepherd it through? There's currently 6 filesystems that have the same #define. Move it into errno.h so it's defined in just one place. Signed-off-by: Valdis Kletnieks --- drivers/staging/exfat/exfat.h| 2 -- fs/erofs/internal.h | 2 -- fs/ext4/ext4.h | 1 - fs/f2fs/f2fs.h | 1 - fs/xfs/xfs_linux.h | 1 - include/linux/jbd2.h | 1 - include/uapi/asm-generic/errno.h | 1 + 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index 84de1123e178..3cf7e54af0b7 100644 --- a/drivers/staging/exfat/exfat.h +++ b/drivers/staging/exfat/exfat.h @@ -30,8 +30,6 @@ #undef DEBUG #endif -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ - #define DENTRY_SIZE32 /* dir entry size */ #define DENTRY_SIZE_BITS 5 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 544a453f3076..3980026a8882 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -425,7 +425,5 @@ static inline int z_erofs_init_zip_subsystem(void) { return 0; } static inline void z_erofs_exit_zip_subsystem(void) {} #endif /* !CONFIG_EROFS_FS_ZIP */ -#define EFSCORRUPTEDEUCLEAN /* Filesystem is corrupted */ - #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 03db3e71676c..a86c2585457d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3396,6 +3396,5 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh) #endif /* __KERNEL__ */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _EXT4_H */ diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4024790028aa..04ebe77569a3 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3752,6 +3752,5 @@ static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) } #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _LINUX_F2FS_H */ diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index ca15105681ca..3409d02a7d21 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -123,7 +123,6 @@ typedef __u32 xfs_nlink_t; #define ENOATTRENODATA /* Attribute not found */ #define EWRONGFS EINVAL /* Mount with wrong filesystem type */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ #define SYNCHRONIZE() barrier() diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 564793c24d12..1ecd3859d040 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1657,6 +1657,5 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal) #endif /* __KERNEL__ */ #define EFSBADCRC EBADMSG /* Bad CRC detected */ -#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* _LINUX_JBD2_H */ diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h index cf9c51ac49f9..1d5ffdf54cb0 100644 --- a/include/uapi/asm-generic/errno.h +++ b/include/uapi/asm-generic/errno.h @@ -98,6 +98,7 @@ #defineEINPROGRESS 115 /* Operation now in progress */ #defineESTALE 116 /* Stale file handle */ #defineEUCLEAN 117 /* Structure needs cleaning */ +#defineEFSCORRUPTEDEUCLEAN #defineENOTNAM 118 /* Not a XENIX named type file */ #defineENAVAIL 119 /* No XENIX semaphores available */ #defineEISNAM 120 /* Is a named type file */ -- 2.24.0.rc1 ___ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel