From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:45110 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885AbeAQCkG (ORCPT ); Tue, 16 Jan 2018 21:40:06 -0500 Date: Tue, 16 Jan 2018 18:40:04 -0800 From: Eric Biggers To: Chandan Rajendra Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, tytso@mit.edu Subject: Re: [RFC PATCH 8/8] ext4: enable encryption for blocksize less than page size Message-ID: <20180117024004.GH4477@zzz.localdomain> References: <20180112141129.27507-1-chandan@linux.vnet.ibm.com> <20180112141129.27507-9-chandan@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180112141129.27507-9-chandan@linux.vnet.ibm.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Fri, Jan 12, 2018 at 07:41:29PM +0530, Chandan Rajendra wrote: > Now that we have all the code to support encryption for block size less > than page size scenario, this commit removes the conditional check in > filesystem mount code. > > Signed-off-by: Chandan Rajendra > --- > fs/ext4/super.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index ebb7edb..5a52c98 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -4138,14 +4138,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) > } > } > > - if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) && > - (blocksize != PAGE_SIZE)) { > - ext4_msg(sb, KERN_ERR, > - "Unsupported blocksize for fs encryption"); > - goto failed_mount_wq; > - } > - > - if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) && > + if (DUMMY_ENCRYPTION_ENABLED(sbi) && !(sb->s_flags & MS_RDONLY) && > !ext4_has_feature_encrypt(sb)) { > ext4_set_feature_encrypt(sb); > ext4_commit_super(sb, 1); Why change sb_rdonly() to 'sb->s_flags & MS_RDONLY'? Eric