From patchwork Sun Apr 2 11:28:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 13197400 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 C5475C7619A for ; Sun, 2 Apr 2023 14:17:00 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1piyVv-00021h-Eb; Sun, 02 Apr 2023 14:17:00 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1piyVu-00021b-6N for linux-f2fs-devel@lists.sourceforge.net; Sun, 02 Apr 2023 14:16:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oAJ6wnKs7pHk1kU21AHBCRd0mLOp7pIytOQooGGNy1Y=; b=mjXRMh0SqYa3Dz5gBnM6kd4BNs KZ+QamZCFnqgf78dcIn3dKcSJRXguslON56vO6IUW2FZmORg5rXmJ+Nzk3HYfEpWEBJG8FbAEt0mI IzUdmy9AnNkM2B2IkQvA6uCr+Gf6+HKe795vv/XeuuYJziSiJyBIi6NKAEHVThn+FSk0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=oAJ6wnKs7pHk1kU21AHBCRd0mLOp7pIytOQooGGNy1Y=; b=F lkshm5rxNDLAsmSkHpgf3KtDDqiJ4+OaF7plr2+3CAkI2rkKTpqo37J0IiiA8npodKhwZpK/Ggw7D zKmR2lAnOszZZSsxLx6xk9Bj1nUGKc4RwtzpHtoiZ4SQXBsR5gYUHSrZjP8OIxmhxK3KS+WfG3NqL PQoprtgI+O3GdbxM=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1piyVu-00CrGN-9f for linux-f2fs-devel@lists.sourceforge.net; Sun, 02 Apr 2023 14:16:58 +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 E33846121F for ; Sun, 2 Apr 2023 14:16:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C27BC433EF; Sun, 2 Apr 2023 14:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680445012; bh=Qtn8hWe71iYL9XhCOCUkzSe1paWQKj/BQ5emAN7XJ0g=; h=From:To:Cc:Subject:Date:From; b=X2wM5cOl9weVcBsxJh1ZyFcw1pOWFy7Vj7wh4ACVlrt58Rb+NhkgDz+psWsoDquDc qw2cF+Tvl6L2i961U+hvI4wgMn/o5FJtryRoKykoF9xM/5WpB+8LtjFzZdctb2ULcc g4rOblIcczYYrylu8i6k5knfjFrFUvCASA7Zbsm58XacdF/NhgjPHfg6udISvibXvr JKte1GOUM9Sjnqe+NOOK5wP8Rx4fw1xTVyQF+J9K4bQ3tKI5fGEUszds66jbyceqpq Tot0BqFLANebBYBeM7SJMa+GvawQI0BpKO/T/lpmXU527ib/u6C2bQHesIGskjWtbK AGbkGbz12RT5Q== From: Chao Yu To: jaegeuk@kernel.org Date: Sun, 2 Apr 2023 19:28:25 +0800 Message-Id: <20230402112825.42486-1-chao@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Headers-End: 1piyVu-00CrGN-9f Subject: [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 Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net 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 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);