| Message ID | 1480629741-18375-2-git-send-email-richard@nod.at (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 1, 2016 at 11:02 PM, Richard Weinberger <richard@nod.at> wrote: > Since UBIFS will also use this function, move it to compat.h. > > Signed-off-by: Richard Weinberger <richard@nod.at> > --- > fs/ext4/dir.c | 9 --------- > include/linux/compat.h | 2 ++ > 2 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c > index e8b365000d73..464e6e99d744 100644 > --- a/fs/ext4/dir.c > +++ b/fs/ext4/dir.c > @@ -290,15 +290,6 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) > return err; > } > > -static inline int is_32bit_api(void) > -{ > -#ifdef CONFIG_COMPAT > - return in_compat_syscall(); > -#else > - return (BITS_PER_LONG == 32); > -#endif > -} > - > /* > * These functions convert from the major/minor hash to an f_pos > * value for dx directories > diff --git a/include/linux/compat.h b/include/linux/compat.h > index 63609398ef9f..8412382e8d08 100644 > --- a/include/linux/compat.h > +++ b/include/linux/compat.h > @@ -730,11 +730,13 @@ asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32, > #ifndef in_compat_syscall > static inline bool in_compat_syscall(void) { return is_compat_task(); } > #endif > +static inline int is_32bit_api(void) { return in_compat_syscall(); } > > #else > > #define is_compat_task() (0) > static inline bool in_compat_syscall(void) { return false; } > +static inline int is_32bit_api(void) { return BITS_PER_LONG == 32; } > > #endif /* CONFIG_COMPAT */ Just realized that this patch didn't get any feedback. Ted, are you fine with it? Anyway, exportable UBIFS has to wait until the next merge window.
On Dec 1, 2016, at 3:02 PM, Richard Weinberger <richard@nod.at> wrote: > > Since UBIFS will also use this function, move it to compat.h. > > Signed-off-by: Richard Weinberger <richard@nod.at> Looks fine, could have minor improvement as mentioned below. Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/dir.c | 9 --------- > include/linux/compat.h | 2 ++ > 2 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c > index e8b365000d73..464e6e99d744 100644 > --- a/fs/ext4/dir.c > +++ b/fs/ext4/dir.c > @@ -290,15 +290,6 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) > return err; > } > > -static inline int is_32bit_api(void) > -{ > -#ifdef CONFIG_COMPAT > - return in_compat_syscall(); > -#else > - return (BITS_PER_LONG == 32); > -#endif > -} > - > /* > * These functions convert from the major/minor hash to an f_pos > * value for dx directories > diff --git a/include/linux/compat.h b/include/linux/compat.h > index 63609398ef9f..8412382e8d08 100644 > --- a/include/linux/compat.h > +++ b/include/linux/compat.h > @@ -730,11 +730,13 @@ asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32, > #ifndef in_compat_syscall > static inline bool in_compat_syscall(void) { return is_compat_task(); } > #endif > +static inline int is_32bit_api(void) { return in_compat_syscall(); } > > #else This would benefit from an annotation to make it clear what the "#if" is: #else /* !CONFIG_COMPAT */ > > #define is_compat_task() (0) > static inline bool in_compat_syscall(void) { return false; } > +static inline int is_32bit_api(void) { return BITS_PER_LONG == 32; } > > #endif /* CONFIG_COMPAT */ Cheers, Andreas
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index e8b365000d73..464e6e99d744 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -290,15 +290,6 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) return err; } -static inline int is_32bit_api(void) -{ -#ifdef CONFIG_COMPAT - return in_compat_syscall(); -#else - return (BITS_PER_LONG == 32); -#endif -} - /* * These functions convert from the major/minor hash to an f_pos * value for dx directories diff --git a/include/linux/compat.h b/include/linux/compat.h index 63609398ef9f..8412382e8d08 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -730,11 +730,13 @@ asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32, #ifndef in_compat_syscall static inline bool in_compat_syscall(void) { return is_compat_task(); } #endif +static inline int is_32bit_api(void) { return in_compat_syscall(); } #else #define is_compat_task() (0) static inline bool in_compat_syscall(void) { return false; } +static inline int is_32bit_api(void) { return BITS_PER_LONG == 32; } #endif /* CONFIG_COMPAT */
Since UBIFS will also use this function, move it to compat.h. Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/ext4/dir.c | 9 --------- include/linux/compat.h | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-)