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: 9424969 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 CB6416047D for ; Sun, 13 Nov 2016 21:24:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC47E288A2 for ; Sun, 13 Nov 2016 21:24:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0DF628906; Sun, 13 Nov 2016 21:24:14 +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 64C06288A2 for ; Sun, 13 Nov 2016 21:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935180AbcKMVX7 (ORCPT ); Sun, 13 Nov 2016 16:23:59 -0500 Received: from mail.sigma-star.at ([95.130.255.111]:46009 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964940AbcKMVWK (ORCPT ); Sun, 13 Nov 2016 16:22:10 -0500 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 Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, dedekind1@gmail.com, adrian.hunter@intel.com, tytso@mit.edu, jaegeuk@kernel.org, david@sigma-star.at, wd@denx.de, sbabic@denx.de, dengler@linutronix.de, ebiggers@google.com, mhalcrow@google.com, hch@infradead.org, Richard Weinberger 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> 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 ...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, ...);