From patchwork Sun Nov 13 21:21:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 694189 X-Patchwork-Delegate: richard@nod.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tH6Fg6Dvmz9t0q for ; Mon, 14 Nov 2016 08:28:07 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c62Is-0000zV-Il; Sun, 13 Nov 2016 21:27:06 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c62F6-0005Fg-Gu for linux-mtd@bombadil.infradead.org; Sun, 13 Nov 2016 21:23:12 +0000 Received: from mail.sigma-star.at ([95.130.255.111]) by merlin.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c62F4-0003tK-AM for linux-mtd@lists.infradead.org; Sun, 13 Nov 2016 21:23:11 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id 4B13824E0015; Sun, 13 Nov 2016 22:22:07 +0100 (CET) Received: from linux.site (richard.vpn.sigmapriv.at [10.3.0.5]) by mail.sigma-star.at (Postfix) with ESMTPSA id 6467B24E0007; Sun, 13 Nov 2016 22:21:59 +0100 (CET) From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 18/29] ubifs: Constify struct inode pointer in ubifs_crypt_is_encrypted() Date: Sun, 13 Nov 2016 22:21:01 +0100 Message-Id: <1479072072-6844-19-git-send-email-richard@nod.at> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479072072-6844-1-git-send-email-richard@nod.at> References: <1479072072-6844-1-git-send-email-richard@nod.at> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161113_162310_584615_147AE24C X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: david@sigma-star.at, tytso@mit.edu, dedekind1@gmail.com, Richard Weinberger , ebiggers@google.com, mhalcrow@google.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, hch@infradead.org, linux-fsdevel@vger.kernel.org, jaegeuk@kernel.org, dengler@linutronix.de, sbabic@denx.de MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org ...and provide a non const variant for fscrypto Signed-off-by: Richard Weinberger --- fs/ubifs/crypto.c | 2 +- fs/ubifs/super.c | 2 +- fs/ubifs/ubifs.h | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c index 12a0072bddd3..25bb2062b8a3 100644 --- a/fs/ubifs/crypto.c +++ b/fs/ubifs/crypto.c @@ -39,7 +39,7 @@ struct fscrypt_operations ubifs_crypt_operations = { .flags = FS_CFLG_INPLACE_ENCRYPTION, .get_context = ubifs_crypt_get_context, .set_context = ubifs_crypt_set_context, - .is_encrypted = ubifs_crypt_is_encrypted, + .is_encrypted = __ubifs_crypt_is_encrypted, .empty_dir = ubifs_crypt_empty_dir, .max_namelen = ubifs_crypt_max_namelen, .key_prefix = ubifs_key_prefix, diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index e85d5a47aeac..a31222947265 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2000,7 +2000,7 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi) #ifndef CONFIG_UBIFS_FS_ENCRYPTION struct fscrypt_operations ubifs_crypt_operations = { - .is_encrypted = ubifs_crypt_is_encrypted, + .is_encrypted = __ubifs_crypt_is_encrypted, }; #endif diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 16484570e2a6..8d61b2fc3e82 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1814,13 +1814,18 @@ extern struct fscrypt_operations ubifs_crypt_operations; #define fscrypt_fname_usr_to_disk fscrypt_notsupp_fname_usr_to_disk #endif -static inline bool ubifs_crypt_is_encrypted(struct inode *inode) +static inline bool __ubifs_crypt_is_encrypted(struct inode *inode) { struct ubifs_inode *ui = ubifs_inode(inode); return ui->flags & UBIFS_CRYPT_FL; } +static inline bool ubifs_crypt_is_encrypted(const struct inode *inode) +{ + return __ubifs_crypt_is_encrypted((struct inode *)inode); +} + /* Normal UBIFS messages */ __printf(2, 3) void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...);