From patchwork Tue Mar 26 07:52:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 10870589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F8301390 for ; Tue, 26 Mar 2019 07:52:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2C9C28D18 for ; Tue, 26 Mar 2019 07:52:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4C5229087; Tue, 26 Mar 2019 07:52:52 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 9DA4828D18 for ; Tue, 26 Mar 2019 07:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730624AbfCZHww (ORCPT ); Tue, 26 Mar 2019 03:52:52 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:54737 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730422AbfCZHww (ORCPT ); Tue, 26 Mar 2019 03:52:52 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1h8gss-0004MT-Ic; Tue, 26 Mar 2019 08:52:34 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.92-RC6) (envelope-from ) id 1h8gsr-00038P-Mn; Tue, 26 Mar 2019 08:52:33 +0100 From: Sascha Hauer To: linux-mtd@lists.infradead.org Cc: Richard Weinberger , linux-fscrypt@vger.kernel.org, "Theodore Y . Ts'o" , kernel@pengutronix.de, Sascha Hauer Subject: [PATCH 0/2] ubifs: Get rid of some ifdefs Date: Tue, 26 Mar 2019 08:52:30 +0100 Message-Id: <20190326075232.11717-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-fscrypt@vger.kernel.org Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This series gets rid of some ifdefs in the UBFIS code. fscrypt folks are on Cc because I introduce a static inline wrapper for setting the super_block.s_cop ops so that filesystems do not have to add a #ifdef CONFIG_FS_ENCRYPTION around setting the ops. I can do this as an extra patch if that's desired. Sascha Sascha Hauer (2): ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION ubifs: Remove ifdefs around CONFIG_UBIFS_ATIME_SUPPORT fs/ubifs/dir.c | 2 -- fs/ubifs/file.c | 16 +++++++--------- fs/ubifs/ioctl.c | 11 +---------- fs/ubifs/sb.c | 7 ++++--- fs/ubifs/super.c | 20 +++++++++----------- fs/ubifs/ubifs.h | 2 -- include/linux/fscrypt.h | 11 +++++++++++ 7 files changed, 32 insertions(+), 37 deletions(-)