From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 512B721FF49 for ; Mon, 12 Jan 2026 01:37:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768181847; cv=none; b=o2Fr1Gr5Ae2AmjWVITIFupoDkyb/axBSp2k6CnAhchBL9kuTKuX105oYnxGIDQLyATrxegRsLSVnt2qWvEdRTbgoBIfS8stOrVVBNdhLEot3gDA4dxbjWa9T3zI46lXTtZRC8TqT5jRJSl+HhCrOpHl8npp9D4Tj+N6KSLHXQwg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768181847; c=relaxed/simple; bh=V35cuMwy1WrbHsiAT+F615WPdkq4vfT531EUjGWfZwI=; h=Message-ID:Date:MIME-Version:Cc:Subject:To:References:From: In-Reply-To:Content-Type; b=QcPAJIRCLZq7lWBAgAITPCEgye/C1W4cMfe+Gx5Xvd8MsZP1T9MiGSMkuQT9SfWq0xpHj9HQt/YRocus/yYnfeiqtp9eyMbvronw5W8yF6MdGRuYL7fxM6UeSskJvNv6xTM6wN+MdqcirgrZ1vqpShhu07PjRzPEaEDTPOaOL8o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dPeoTNB4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dPeoTNB4" 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH] f2fs: make FAULT_DISCARD obsolete To: jaegeuk@kernel.org References: <20251215122803.3495320-1-chao@kernel.org> Content-Language: en-US From: Chao Yu In-Reply-To: <20251215122803.3495320-1-chao@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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,