| Message ID | 20190314173900.25454-1-paul.burton@mips.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f6cab793d4a70808e4946baa8f5df4ea9adacc82 |
| Headers | show |
| Series | MIPS: Remove custom MIPS32 __kernel_fsid_t type | expand |
Hello, Paul Burton wrote: > For MIPS32 kernels we have a custom definition of __kernel_fsid_t. This > differs from the asm-generic version used by all other architectures & > MIPS64 in one way - it declares the val field as an array of long, > rather than an array of int. Since int & long have identical size & > alignment when targeting MIPS32 anyway, this makes little sense. > > Beyond the pointlessness this causes problems for code which prints > entries from the val array, for example the fanotify_encode_fid() > function [1]. If such code uses a format specified suited to an int then > it encounters compiler warnings when building for MIPS32, such as: > > In file included from include/linux/kernel.h:14:0, > from include/linux/list.h:9, > from include/linux/preempt.h:11, > from include/linux/spinlock.h:51, > from include/linux/fdtable.h:11, > from fs/notify/fanotify/fanotify.c:3: > fs/notify/fanotify/fanotify.c: In function 'fanotify_encode_fid': > include/linux/kern_levels.h:5:18: warning: format '%x' expects argument > of type 'unsigned int', but argument 2 has type 'long int' [-Wformat=] > > Remove the custom __kernel_fsid_t definition & make use of the > asm-generic version which will have an identical layout in memory > anyway, in order to remove the inconsistency with other architectures. > > One possible regression this could cause if is any code is attempting to > print entries from the val array with a long-sized format specifier, in > which case it would begin seeing compiler warnings when built against > kernel headers including this change. Since such code is exceedingly > rare, and would have to be MIPS32-specific to expect a long, this seems > to be a problem that it's extremely unlikely anyone will encounter. > > [1] https://lore.kernel.org/linux-mips/CAOQ4uxiEkczB7PNCXegFC-eYb9zAGaio_o=OgHAJHFd7eavBxA@mail.gmail.com/T/#mb43103277c79ef06b884359209e817db1c136140 > > Signed-off-by: Paul Burton <paul.burton@mips.com> > Cc: Amir Goldstein <amir73il@gmail.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Jan Kara <jack@suse.cz> > Cc: linux-arch@vger.kernel.org > Cc: linux-mips@vger.kernel.org Applied to mips-fixes. Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/arch/mips/include/uapi/asm/posix_types.h b/arch/mips/include/uapi/asm/posix_types.h index 6aa49c10f88f..f0ccb5b90ce9 100644 --- a/arch/mips/include/uapi/asm/posix_types.h +++ b/arch/mips/include/uapi/asm/posix_types.h @@ -21,13 +21,6 @@ typedef long __kernel_daddr_t; #define __kernel_daddr_t __kernel_daddr_t -#if (_MIPS_SZLONG == 32) -typedef struct { - long val[2]; -} __kernel_fsid_t; -#define __kernel_fsid_t __kernel_fsid_t -#endif - #include <asm-generic/posix_types.h> #endif /* _ASM_POSIX_TYPES_H */
For MIPS32 kernels we have a custom definition of __kernel_fsid_t. This differs from the asm-generic version used by all other architectures & MIPS64 in one way - it declares the val field as an array of long, rather than an array of int. Since int & long have identical size & alignment when targeting MIPS32 anyway, this makes little sense. Beyond the pointlessness this causes problems for code which prints entries from the val array, for example the fanotify_encode_fid() function [1]. If such code uses a format specified suited to an int then it encounters compiler warnings when building for MIPS32, such as: In file included from include/linux/kernel.h:14:0, from include/linux/list.h:9, from include/linux/preempt.h:11, from include/linux/spinlock.h:51, from include/linux/fdtable.h:11, from fs/notify/fanotify/fanotify.c:3: fs/notify/fanotify/fanotify.c: In function 'fanotify_encode_fid': include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long int' [-Wformat=] Remove the custom __kernel_fsid_t definition & make use of the asm-generic version which will have an identical layout in memory anyway, in order to remove the inconsistency with other architectures. One possible regression this could cause if is any code is attempting to print entries from the val array with a long-sized format specifier, in which case it would begin seeing compiler warnings when built against kernel headers including this change. Since such code is exceedingly rare, and would have to be MIPS32-specific to expect a long, this seems to be a problem that it's extremely unlikely anyone will encounter. [1] https://lore.kernel.org/linux-mips/CAOQ4uxiEkczB7PNCXegFC-eYb9zAGaio_o=OgHAJHFd7eavBxA@mail.gmail.com/T/#mb43103277c79ef06b884359209e817db1c136140 Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Amir Goldstein <amir73il@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Jan Kara <jack@suse.cz> Cc: linux-arch@vger.kernel.org Cc: linux-mips@vger.kernel.org --- arch/mips/include/uapi/asm/posix_types.h | 7 ------- 1 file changed, 7 deletions(-)