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 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7ABB5C76188 for ; Mon, 3 Apr 2023 17:59:17 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pjOSa-0003EI-Ki; Mon, 03 Apr 2023 17:59:15 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pjOSZ-0003EC-Cm for linux-f2fs-devel@lists.sourceforge.net; Mon, 03 Apr 2023 17:59:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hLW3H3+up4bwNFKuuHWPEjJmKcKp/zCWRGX6oPaht3Y=; b=lJN4UaHbDPeEkgaud2ljPFnsTH vdoY69koW1JL3Oga4wBgU8e4N/rjZOTzlVyH+qlfnEIVhS+YhOjSfvF9f79eFcKfjGal36siuF27c cv37W2MpF5xdzhUNhHdC58cvuvsclH5RJtsKa7ClLec2xRaKzSM3Eeb0PSg4c+At9K+g=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hLW3H3+up4bwNFKuuHWPEjJmKcKp/zCWRGX6oPaht3Y=; b=aW3nrDeBHDuq730HnGL5XJCRhc zE0jnpd0zUI8AqiELRP5vIhCWDOzFK6EOjKFDuH+FzqZ00SL6j7EaKbcGd+S+JyOt1/vg9DUXEVu1 TuWdXSYHu1oJFQxMxP1C8wzJQOjQMLj79ukNK2OYVG7Ijp52Eck/ic9uydCRwpvkU+Do=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pjOSX-0006Ht-PC for linux-f2fs-devel@lists.sourceforge.net; Mon, 03 Apr 2023 17:59:14 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 120AF61D1F for ; Mon, 3 Apr 2023 17:59:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E3E1C433EF; Mon, 3 Apr 2023 17:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680544744; bh=khDYkXvty0Ffs3qj1iEECXU0QHcjnVT1YU5sAurqjBc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TwP+fz7R4y7fEgk7DFITpHPKnhIBPIZHj3VKXNyCQjTlNtEnTvCLRbNrSmYsOBXib 8CIIH5uQPfwOE62ebPFU/GtZ7vnCCQs31qAJGrjcApvhzvmLQcaMIZBCkmuBOAy8f8 2hmxxClwdlVoqJsIUlBorabLbh5SjWWIqEBFbkqvhw5iCg7xNQcXeMfaZ9t0Lgi50h PG4M3pwMBM6XKoVxqR5KHiEMSsjou78vX2NOJwj70nyS5m1b6ftTV6wpYdZsNSZNel I0PT0ETSK+UFfgx6GKwOsVRvfhNJb7MqZgDwWKf1wenFDLq6FPFMyIBxltXSJfTyxB xskj06dFIsFew== Date: Mon, 3 Apr 2023 10:59:02 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20230402112825.42486-1-chao@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230402112825.42486-1-chao@kernel.org> X-Headers-End: 1pjOSX-0006Ht-PC Subject: Re: [f2fs-dev] [PATCH] f2fs: fix to check readonly condition correctly X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 04/02, Chao Yu wrote: > This patch does below changes: > > - If f2fs enables readonly feature or device is readonly, allow to > mount readonly mode only > - Introduce f2fs_dev_is_readonly() to indicate whether image or device > is readonly > - remove unnecessary f2fs_hw_is_readonly() in f2fs_write_checkpoint() > and f2fs_convert_inline_inode() > - enable FLUSH_MERGE only if f2fs is mounted as rw and image/device > is writable What is the problem to solve here? > > Signed-off-by: Chao Yu > --- > fs/f2fs/checkpoint.c | 2 +- > fs/f2fs/f2fs.h | 10 +++++----- > fs/f2fs/inline.c | 3 +-- > fs/f2fs/super.c | 13 +++++++------ > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index 8e1db5752fff..1eef597ed393 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -1604,7 +1604,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > unsigned long long ckpt_ver; > int err = 0; > > - if (f2fs_readonly(sbi->sb) || f2fs_hw_is_readonly(sbi)) > + if (f2fs_readonly(sbi->sb)) > return -EROFS; > > if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 2d4a7ef62537..7de95133478a 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -4446,6 +4446,11 @@ static inline bool f2fs_hw_is_readonly(struct f2fs_sb_info *sbi) > return false; > } > > +static inline bool f2fs_dev_is_readonly(struct f2fs_sb_info *sbi) > +{ > + return f2fs_sb_has_readonly(sbi) || f2fs_hw_is_readonly(sbi); > +} > + > static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi) > { > return F2FS_OPTION(sbi).fs_mode == FS_MODE_LFS; > @@ -4546,11 +4551,6 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs, > } > } > > -static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi) > -{ > - return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb); > -} > - > #define EFSBADCRC EBADMSG /* Bad CRC detected */ > #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ > > diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c > index 72269e7efd26..2c36f2dc2317 100644 > --- a/fs/f2fs/inline.c > +++ b/fs/f2fs/inline.c > @@ -203,8 +203,7 @@ int f2fs_convert_inline_inode(struct inode *inode) > struct page *ipage, *page; > int err = 0; > > - if (!f2fs_has_inline_data(inode) || > - f2fs_hw_is_readonly(sbi) || f2fs_readonly(sbi->sb)) > + if (!f2fs_has_inline_data(inode) || f2fs_readonly(sbi->sb)) > return 0; > > err = f2fs_dquot_initialize(inode); > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index d016f398fcad..db7649010c12 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -1382,15 +1382,16 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) > return -EINVAL; > } > > - if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) { > + if (f2fs_dev_is_readonly(sbi) && !f2fs_readonly(sbi->sb)) { > + f2fs_err(sbi, "Allow to mount readonly mode only"); > + return -EROFS; > + } > + > + if (f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) { > f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode"); > return -EINVAL; > } > > - if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) { > - f2fs_err(sbi, "Allow to mount readonly mode only"); > - return -EROFS; > - } > return 0; > } > > @@ -2122,7 +2123,7 @@ static void default_options(struct f2fs_sb_info *sbi) > set_opt(sbi, MERGE_CHECKPOINT); > F2FS_OPTION(sbi).unusable_cap = 0; > sbi->sb->s_flags |= SB_LAZYTIME; > - if (!f2fs_is_readonly(sbi)) > + if (!f2fs_readonly(sbi->sb) && !f2fs_dev_is_readonly(sbi)) > set_opt(sbi, FLUSH_MERGE); > if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi)) > set_opt(sbi, DISCARD); > -- > 2.36.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel