From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Richard Weinberger To: linux-mtd@lists.infradead.org Cc: david@sigma-star.at, dedekind1@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, adilger.kernel@dilger.ca, akpm@linux-foundation.org, linux-ext4@vger.kernel.org, bfields@redhat.com, marcus.folkesson@gmail.com, hyc.lee@gmail.com, rockdotlee@gmail.com, leon.pollak@gmail.com, Richard Weinberger Subject: [PATCH 1/6] ext4: Move is_32bit_api() to generic code Date: Sun, 21 May 2017 22:20:46 +0200 Message-Id: <1495398051-4604-2-git-send-email-richard@nod.at> In-Reply-To: <1495398051-4604-1-git-send-email-richard@nod.at> References: <1495398051-4604-1-git-send-email-richard@nod.at> Sender: linux-kernel-owner@vger.kernel.org List-ID: Since UBIFS will also use this function, move it to compat.h. Signed-off-by: Richard Weinberger Reviewed-by: Andreas Dilger --- 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 1c5f3152cbb5..f33ffd8040a1 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -736,6 +736,7 @@ asmlinkage long compat_sys_arch_prctl(int option, unsigned long arg2); #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(); } /** * ns_to_compat_timeval - Compat version of ns_to_timeval @@ -759,6 +760,7 @@ static inline struct compat_timeval ns_to_compat_timeval(s64 nsec) #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 */ -- 2.12.0