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 62F6ED2502E for ; Mon, 12 Jan 2026 01:37:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Type:Content-Transfer-Encoding:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:In-Reply-To:References:To:MIME-Version:Date: Message-ID:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=y6MSxXTInkjcjf2CzD9R0mOn36/FzcK1dnJy5zNWF70=; b=HyFQ2hWSo3ri7pEDFzf2fCfVNJ IVYziM+kZwOqTfQcoTcd52Hvba3z+mMZgDnKL96/PHEdlEWaDR0O+z/hrKmJpqIsK4tT5GzrD9xvg vHeyi9sZ99CtgXbKEZ797DQL79hsjv/ugWeLaDVZuhFUHb6rWzC92+sl+oAr+a9EJs+4=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vf6sE-0005Ny-Uc; Mon, 12 Jan 2026 01:37:38 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vf6sD-0005Nr-UV for linux-f2fs-devel@lists.sourceforge.net; Mon, 12 Jan 2026 01:37:37 +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: From:References:To:Subject:Cc: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=NIJJM9wC+tRNNE4rLCT370SpkTVot775NbvyfUmsrNY=; b=Rcnf5EaUOO/VetIvTLPs0X0khn Eekde0YhRYLvz/CCQyOP37xqm9QKh/vILoOnluzrsAfRPjZkvW4fSpX6+fU6fzmFyRGTTCXpw1FQy 4rrfMWQisX1KF7SCbFQ5rpYB3K/E0bUhWIRLf+dLFt/ftHJFsPepBfBWaTGQdDcmErnc=; 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:From:References:To: Subject:Cc: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=NIJJM9wC+tRNNE4rLCT370SpkTVot775NbvyfUmsrNY=; b=a1NcxZSMXMafM3Ej1MGdcaKWw+ otJX9Fg+Yg4A4Bp7OLLjqHN+hQEO2OwX/Oea91LEmA62i/asv9RgGumtKI+vvVYqz+08Vt9uVgCvW HNpT+jrCrQFzsN5gMIcNN+OEeag5fMvjxFKCkVCApRiWzYEbBG0bJwK+NT2u/tvDC3Y4=; Received: from sea.source.kernel.org ([172.234.252.31]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vf6sD-0001BQ-Ef for linux-f2fs-devel@lists.sourceforge.net; Mon, 12 Jan 2026 01:37:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 17BCD443EE for ; Mon, 12 Jan 2026 01:37:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19823C4CEF7; Mon, 12 Jan 2026 01:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768181847; bh=V35cuMwy1WrbHsiAT+F615WPdkq4vfT531EUjGWfZwI=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=dPeoTNB4BbkqcJkfkrgEocoQ/dkpIq5D+u4ANuPGPQYf5fNuZv/5uejaASupDK1QR ZhC+Jb3rZMHL+27duIZ3RHxasO0yCwoo+QgWqd7rQrb7p+K0M8xJOFlISVIbR9tgVs oyG3qTg84jg3pFlG4/+uI6/E11Z7i9YJJ2epSAW7QMMchFg7ios4DwfeKdwo4wkd2m HGcv4IWDzO2o+Sk6dk5+VnLuhk5QUIzPRZlb4spwt3vQGXB45Z3qE+IYsw7ZB2x6BL /gFs+etu9exXDZ3TI7i7dMDOm7cKlQPR+cdtrat5j96YCD0pEkUKls3eZC+V+v0aA6 67VWGpxt49KFw== Message-ID: Date: Mon, 12 Jan 2026 09:37:26 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: jaegeuk@kernel.org References: <20251215122803.3495320-1-chao@kernel.org> Content-Language: en-US In-Reply-To: <20251215122803.3495320-1-chao@kernel.org> X-Headers-End: 1vf6sD-0001BQ-Ef Subject: Re: [f2fs-dev] [PATCH] f2fs: make FAULT_DISCARD obsolete 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: , From: Chao Yu via Linux-f2fs-devel Reply-To: Chao Yu 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 Ping, On 12/15/2025 8:28 PM, Chao Yu wrote: > __blkdev_issue_discard() in __submit_discard_cmd() will never fail, so > let's make FAULT_DISCARD fault injection obsolete. > > Signed-off-by: Chao Yu > --- > Documentation/ABI/testing/sysfs-fs-f2fs | 2 +- > Documentation/filesystems/f2fs.rst | 2 +- > fs/f2fs/f2fs.h | 2 +- > fs/f2fs/segment.c | 18 +++--------------- > 4 files changed, 6 insertions(+), 18 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs > index 770470e0598b..7920c233d8ec 100644 > --- a/Documentation/ABI/testing/sysfs-fs-f2fs > +++ b/Documentation/ABI/testing/sysfs-fs-f2fs > @@ -732,7 +732,7 @@ Description: Support configuring fault injection type, should be > FAULT_TRUNCATE 0x00000400 > FAULT_READ_IO 0x00000800 > FAULT_CHECKPOINT 0x00001000 > - FAULT_DISCARD 0x00002000 > + FAULT_DISCARD 0x00002000 (obsolete) > FAULT_WRITE_IO 0x00004000 > FAULT_SLAB_ALLOC 0x00008000 > FAULT_DQUOT_INIT 0x00010000 > diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst > index 9b3b835a174e..27aa4032c7cd 100644 > --- a/Documentation/filesystems/f2fs.rst > +++ b/Documentation/filesystems/f2fs.rst > @@ -206,7 +206,7 @@ fault_type=%d Support configuring fault injection type, should be > FAULT_TRUNCATE 0x00000400 > FAULT_READ_IO 0x00000800 > FAULT_CHECKPOINT 0x00001000 > - FAULT_DISCARD 0x00002000 > + FAULT_DISCARD 0x00002000 (obsolete) > FAULT_WRITE_IO 0x00004000 > FAULT_SLAB_ALLOC 0x00008000 > FAULT_DQUOT_INIT 0x00010000 > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index d7600979218e..65ca1a5eaa88 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -54,7 +54,7 @@ enum { > FAULT_TRUNCATE, > FAULT_READ_IO, > FAULT_CHECKPOINT, > - FAULT_DISCARD, > + FAULT_DISCARD, /* it's obsolete due to __blkdev_issue_discard() will never fail */ > FAULT_WRITE_IO, > FAULT_SLAB_ALLOC, > FAULT_DQUOT_INIT, > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index c26424f47686..5168026b2960 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -1286,7 +1286,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > &(dcc->fstrim_list) : &(dcc->wait_list); > blk_opf_t flag = dpolicy->sync ? REQ_SYNC : 0; > block_t lstart, start, len, total_len; > - int err = 0; > > if (dc->state != D_PREP) > return 0; > @@ -1327,7 +1326,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > dc->di.len = 0; > > - while (total_len && *issued < dpolicy->max_requests && !err) { > + while (total_len && *issued < dpolicy->max_requests) { > struct bio *bio = NULL; > unsigned long flags; > bool last = true; > @@ -1343,17 +1342,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > > dc->di.len += len; > > - err = 0; > - if (time_to_inject(sbi, FAULT_DISCARD)) { > - err = -EIO; > - spin_lock_irqsave(&dc->lock, flags); > - if (dc->state == D_PARTIAL) > - dc->state = D_SUBMIT; > - spin_unlock_irqrestore(&dc->lock, flags); > - > - break; > - } > - > __blkdev_issue_discard(bdev, SECTOR_FROM_BLOCK(start), > SECTOR_FROM_BLOCK(len), GFP_NOFS, &bio); > f2fs_bug_on(sbi, !bio); > @@ -1392,11 +1380,11 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi, > len = total_len; > } > > - if (!err && len) { > + if (len) { > dcc->undiscard_blks -= len; > __update_discard_tree_range(sbi, bdev, lstart, start, len); > } > - return err; > + return 0; > } > > static void __insert_discard_cmd(struct f2fs_sb_info *sbi, _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel