From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EB09C10DCE for ; Sun, 15 Mar 2020 17:16:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B2CB20722 for ; Sun, 15 Mar 2020 17:16:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584292615; bh=+lmpvdxUBRgyrzSD7k7JSLFEM42g3oWA97s0+PhrLF8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=pWKBI3YbYf5qPEzAsB2V5MVF0gsII16e7iRmCJieWdjY6PBNRPfdnwul8EqYf0MsC fWj1SaXt1N1MuJSxTVtMgEuiPrZ2gXFnpW1mIyiBgqAo6sJSv8eTZnw2ldkEYkm5M+ 9DbmDBvqhFcWsTewN9SSs+mZGZqY4Tsbkei2H1OE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728954AbgCORQz (ORCPT ); Sun, 15 Mar 2020 13:16:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:42240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728947AbgCORQy (ORCPT ); Sun, 15 Mar 2020 13:16:54 -0400 Received: from sol.localdomain (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC567206E9; Sun, 15 Mar 2020 17:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584292614; bh=+lmpvdxUBRgyrzSD7k7JSLFEM42g3oWA97s0+PhrLF8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fz8xheLuuQR+wB/DfIa8fMDHBJ96eTBl6qoUQEPumGFkmN+p2eeRitOsIvPQcwEWX sRdvJhFc0FfCr/6CNrztD5Ta/DRrUiu5/aYHe+U70wAB9I8f7fFCSoPsWq5PyGQl0F bbS551kFvD0b5ZrLw8+8RdX4rlEDR7PjNypkYRrs= Date: Sun, 15 Mar 2020 10:16:52 -0700 From: Eric Biggers To: Satya Tangirala Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org, Barani Muthukumaran , Kuohong Wang , Kim Boojin Subject: Re: [PATCH v8 10/11] f2fs: add inline encryption support Message-ID: <20200315171652.GA1055@sol.localdomain> References: <20200312080253.3667-1-satyat@google.com> <20200312080253.3667-11-satyat@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200312080253.3667-11-satyat@google.com> Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org On Thu, Mar 12, 2020 at 01:02:52AM -0700, Satya Tangirala wrote: > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 5355be6b6755..75817f0dc6f8 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -139,6 +139,9 @@ struct f2fs_mount_info { > int alloc_mode; /* segment allocation policy */ > int fsync_mode; /* fsync policy */ > bool test_dummy_encryption; /* test dummy encryption */ > +#ifdef CONFIG_FS_ENCRYPTION > + bool inlinecrypt; /* inline encryption enabled */ > +#endif > block_t unusable_cap; /* Amount of space allowed to be > * unusable when disabling checkpoint > */ This bool is unused now. > @@ -1568,6 +1577,9 @@ static void default_options(struct f2fs_sb_info *sbi) > F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT; > F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX; > F2FS_OPTION(sbi).test_dummy_encryption = false; > +#ifdef CONFIG_FS_ENCRYPTION > + sbi->sb->s_flags &= ~SB_INLINECRYPT; > +#endif This really should be CONFIG_FS_ENCRYPTION_INLINE_CRYPT, but actually there's no need for the #ifdef at all. Just clear the flag unconditionally. - Eric