| Message ID | 20191105024618.194134-1-Valdis.Kletnieks@vt.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] errno.h: Provide EFSBADCRC for everybody | expand |
On Mon 04-11-19 21:46:14, Valdis Kletnieks wrote: > 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 <Valdis.Kletnieks@vt.edu> Thanks for the patch! It looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > 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 ENOATTR ENODATA /* 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 @@ > #define EMULTIHOP 72 /* Multihop attempted */ > #define EDOTDOT 73 /* RFS specific error */ > #define EBADMSG 74 /* Not a data message */ > +#define EFSBADCRC EBADMSG /* Bad CRC detected */ > #define EOVERFLOW 75 /* Value too large for defined data type */ > #define ENOTUNIQ 76 /* Name not unique on network */ > #define EBADFD 77 /* File descriptor in bad state */ > -- > 2.24.0.rc1 >
On Mon, Nov 04, 2019 at 09:46:14PM -0500, Valdis Kletnieks wrote: > 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 <Valdis.Kletnieks@vt.edu> Acked-by: Theodore Ts'o <tytso@mit.edu> - Ted
On Mon, Nov 04, 2019 at 09:46:14PM -0500, Valdis Kletnieks wrote: > 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 <Valdis.Kletnieks@vt.edu> Acked-by: Darrick J. Wong <darrick.wong@oracle.com> You can build all six filesystems with both this and the EFSCORRUPTED patch applied, correct? --D > --- > 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 ENOATTR ENODATA /* 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 @@ > #define EMULTIHOP 72 /* Multihop attempted */ > #define EDOTDOT 73 /* RFS specific error */ > #define EBADMSG 74 /* Not a data message */ > +#define EFSBADCRC EBADMSG /* Bad CRC detected */ > #define EOVERFLOW 75 /* Value too large for defined data type */ > #define ENOTUNIQ 76 /* Name not unique on network */ > #define EBADFD 77 /* File descriptor in bad state */ > -- > 2.24.0.rc1 >
On Mon, Nov 04, 2019 at 09:46:14PM -0500, Valdis Kletnieks wrote: > 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 <Valdis.Kletnieks@vt.edu> Looks good, minor nit below: > 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 @@ > #define EMULTIHOP 72 /* Multihop attempted */ > #define EDOTDOT 73 /* RFS specific error */ > #define EBADMSG 74 /* Not a data message */ > +#define EFSBADCRC EBADMSG /* Bad CRC detected */ Inconsistent whitespace here. When you get tab vs space after #define wrong it only shows up in patches. :/ Cheers, Dave.
On Mon, 04 Nov 2019 21:46:14 -0500, Valdis Kletnieks said: > 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 <Valdis.Kletnieks@vt.edu> Going to have to retract this. and the other patch for EFSCORRUPTED. On Tue, 05 Nov 2019 10:17:52 +0000, Rasmus Villemoes <rasmus.villemoes@prevas.dk> said: > Does that work? Six architectures (alpha ia64 mips parisc powerpc sparc) > have their own asm/errno.h. ia64 and powerpc include asm-generic/errno.h > from their asm/errno.h, but the remaining four will no longer have a > definition of EFSBADCRC. I knew some architectures had their own syscall values. I admit it comes as a surprise to me (and probably a number of others) that errno.h is that way too.... Thanks for spotting this, Rasmus...
On Tue, 05 Nov 2019 07:17:36 -0800, "Darrick J. Wong" said: > On Mon, Nov 04, 2019 at 09:46:14PM -0500, Valdis Kletnieks wrote: > > 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 <Valdis.Kletnieks@vt.edu> > > Acked-by: Darrick J. Wong <darrick.wong@oracle.com> > > You can build all six filesystems with both this and the EFSCORRUPTED > patch applied, correct? I can. But it was pointed out to me that it blows up on some architectures..
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 ENOATTR ENODATA /* 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 @@ #define EMULTIHOP 72 /* Multihop attempted */ #define EDOTDOT 73 /* RFS specific error */ #define EBADMSG 74 /* Not a data message */ +#define EFSBADCRC EBADMSG /* Bad CRC detected */ #define EOVERFLOW 75 /* Value too large for defined data type */ #define ENOTUNIQ 76 /* Name not unique on network */ #define EBADFD 77 /* File descriptor in bad state */
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 <Valdis.Kletnieks@vt.edu> --- 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(-)