From patchwork Thu Dec 1 22:02:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 9457095 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CAD660515 for ; Thu, 1 Dec 2016 22:04:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C1892852E for ; Thu, 1 Dec 2016 22:04:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 704AA28542; Thu, 1 Dec 2016 22:04:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08BBB2852E for ; Thu, 1 Dec 2016 22:04:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760630AbcLAWCi (ORCPT ); Thu, 1 Dec 2016 17:02:38 -0500 Received: from mail.sigma-star.at ([95.130.255.111]:45997 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760065AbcLAWCh (ORCPT ); Thu, 1 Dec 2016 17:02:37 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id 3EA6F24E0004; Thu, 1 Dec 2016 23:02:34 +0100 (CET) Received: from linux.site (richard.vpn.sigmapriv.at [10.3.0.5]) by mail.sigma-star.at (Postfix) with ESMTPSA id EF3E524E0001; Thu, 1 Dec 2016 23:02:32 +0100 (CET) From: Richard Weinberger To: linux-mtd@lists.infradead.org Cc: david@sigma-star.at, tytso@mit.edu, 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, Richard Weinberger Subject: [PATCH 1/6] ext4: Move is_32bit_api() to generic code Date: Thu, 1 Dec 2016 23:02:16 +0100 Message-Id: <1480629741-18375-2-git-send-email-richard@nod.at> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480629741-18375-1-git-send-email-richard@nod.at> References: <1480629741-18375-1-git-send-email-richard@nod.at> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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 */