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 D5431C76196 for ; Tue, 11 Apr 2023 15:58:59 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pmGOU-0007DE-Hl; Tue, 11 Apr 2023 15:58:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pmGOT-0007D8-Np for linux-f2fs-devel@lists.sourceforge.net; Tue, 11 Apr 2023 15:58:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: Subject:References:Cc:To:From:MIME-Version:Date:Message-ID:Sender:Reply-To: 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=8ZAJ0Eu13CiXBCgJKJVKMmR3z//rSGukHPLHaPn3AEg=; b=U0U1qI4at7Qd6dd6Tsgjo4e2dS DpMBnNjCJT8Ya5wMs3oyLyZYDz1wyIYa9AmZM4ATIxDOIV+alXyQeysijVBHbyare9I2aviXMwjv4 PEji/mZ7s8nVfXnDTrPTqtcDC1hBwHi+ceQcvVFrl4nyowwutBsNxN0bZrZpQOXdlCoQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:Subject:References:Cc: To:From:MIME-Version:Date:Message-ID:Sender:Reply-To: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=8ZAJ0Eu13CiXBCgJKJVKMmR3z//rSGukHPLHaPn3AEg=; b=FJpsRn8XkHIx+fuf5xjCBiAuv5 oUETqluspbmsOKwymTPz72OaxK5RrNJ/tS/RlIC6rgI3gJK+qu/QwvKbCUbCBMbDb7y5oLKJ0xbKc 4MpqBLbueyPH1PRadYYAAMIojPQxU5vhqinjJdOG9Iz1IB4+6HPde8QsNwJV7eIYzxck=; 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 1pmGOQ-004DRP-Dh for linux-f2fs-devel@lists.sourceforge.net; Tue, 11 Apr 2023 15:58:53 +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 0D30B628E7 for ; Tue, 11 Apr 2023 15:58:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39CDBC433EF; Tue, 11 Apr 2023 15:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681228723; bh=FVfYGoKITaow0kQv/DhrMa1aDiIqpsIFwODNYfZ4L/E=; h=Date:From:To:Cc:References:Subject:In-Reply-To:From; b=sW8LMgg3wZYDg0MdrvNFmbna4OOn/MWuWdfx5+HgIhHG6mdeACixDHkBTmOhIvgUk JMpJNqzjPmSt5Qa56A1oSxyXYj/39VM+TybDwtVcj1LCH8lzru/cqDuUUuZdJKNcdB kkokw2xXs1SIUk+Zv8oDcIv1uu/PqRpOYHS2ful+xhmua7voTbLoBkFty9mBmKeVHd f3d3t6jNdGFQQI4W6O2T9bjevpZ7d+vqkpndE8Y396yLJpuC1kNI4bD8fFfArSTC91 G0lOApqGBHXuCH9JXBSFTkod3YShfjHuLLSN3fT2kjLjQcjk4QRNvwY4nqZjmcLmGh QpdvizK2rcORA== Message-ID: <2c70970b-1938-7b32-8de3-21d93895bef8@kernel.org> Date: Tue, 11 Apr 2023 23:58:39 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US From: Chao Yu To: Jaegeuk Kim References: <20230402112825.42486-1-chao@kernel.org> In-Reply-To: X-Headers-End: 1pmGOQ-004DRP-Dh 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2023/4/10 10:19, Chao Yu wrote: > On 2023/4/4 1:59, Jaegeuk Kim wrote: >> 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 > > Jaegeuk, > > Please drop this patch, and help to check below one, thanks. :) > > f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only() Oh, I didn't make it clear. I found you applied both v1 and v2 of this patch. So I mean how about keeping v2: [PATCH v2] f2fs: fix to check readonly condition correctly https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=2bce08d26c0fe3a4ce1cca03ee0ea0c59d98c0b2 and apply [PATCH] f2fs: use f2fs_hw_is_readonly() instead of bdev_read_only() https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=7ec21ff2e8f521842938415af741fc72f39c0135 to instead [PATCH] f2fs: fix to check readonly condition correctly https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=dev-test&id=66eb18a8b892afe085097747521fb280a1577ea4 Thanks, > > Thanks, > >> >> 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 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel