From nobody Fri Dec 19 11:30:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 EBFC92F4A16 for ; Mon, 8 Dec 2025 12:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765195842; cv=none; b=g6j/OsJtHuDbXObFvZRuBO3UoK6nVuUvQty6A5ngrc4F5R9BcOJQra0hZtDohDqpnarCofPczxq8aBIaxqm0wb349dPl+EVFhe0QRBTGdydAMwCIssBKU6uf485+hixAxeGW/XsGF6d0t5+dwKIvHwX18b/nU1fZaUN2LDj/Dmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765195842; c=relaxed/simple; bh=6yNgwZD6RyqsZur17vkqMRg9mE/1zmq6b8V0MBZ/1ys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fFqB8l0zeQA9mec0J8wKF68WHtwon4sg39LPRbWrSewuGUu7F0vx29UVeBcZD7O/n1dN9WwGpsOFawgLq6daP1CXA97BtV/HgVjKDbBwpfTa5jJZoJ3AQY7WACEQz1r3MGK/QkCdFzjFHsn+dmywinlGiu7pnrNfkcaHG9NxaEw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=htj5rI01; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="htj5rI01" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765195840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDJU7dKZfTVZdt88mgvhpQhy7QhmJF93sojddadeY3g=; b=htj5rI01aF5rNS00/Jhhs6AVejueGufYvbuH3+AoC5EsQhe6V6g8i3GvQ/kRCZtuAWfFnS 70DKzlBl9darJsbaRdCnoVN9nb/DqDLratMAHV6ECK4anLMtlvxKVtqkYEGMdC5VDdlN7I Xd53eivjhxRpTCYzWi9Lg1PRZVc8+4E= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-HrQtQ-lRM--ZhZ_11CK8ag-1; Mon, 08 Dec 2025 07:10:37 -0500 X-MC-Unique: HrQtQ-lRM--ZhZ_11CK8ag-1 X-Mimecast-MFC-AGG-ID: HrQtQ-lRM--ZhZ_11CK8ag_1765195835 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 133CE18002DE; Mon, 8 Dec 2025 12:10:35 +0000 (UTC) Received: from pasta.fast.eng.rdu2.dc.redhat.com (unknown [10.44.34.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8C8321956095; Mon, 8 Dec 2025 12:10:30 +0000 (UTC) From: Andreas Gruenbacher To: Christoph Hellwig , Jens Axboe , Chris Mason , David Sterba Cc: Andreas Gruenbacher , linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-raid@vger.kernel.org, dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC 02/12] bio: use bio_io_error more often Date: Mon, 8 Dec 2025 12:10:09 +0000 Message-ID: <20251208121020.1780402-3-agruenba@redhat.com> In-Reply-To: <20251208121020.1780402-1-agruenba@redhat.com> References: <20251208121020.1780402-1-agruenba@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Instead of setting bio->bi_status to BLK_STS_IOERR and calling bio_endio(bio), use the shorthand bio_io_error(bio). Created with Coccinelle using the following semantic patch: @@ struct bio *bio; @@ - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig --- block/fops.c | 3 +-- drivers/block/drbd/drbd_int.h | 3 +-- drivers/md/bcache/bcache.h | 3 +-- drivers/md/bcache/request.c | 6 ++---- drivers/md/dm-mpath.c | 3 +-- drivers/md/dm-writecache.c | 3 +-- fs/f2fs/segment.c | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/block/fops.c b/block/fops.c index 5e3db9fead77..b4f911273289 100644 --- a/block/fops.c +++ b/block/fops.c @@ -221,8 +221,7 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, s= truct iov_iter *iter, =20 ret =3D blkdev_iov_iter_get_pages(bio, iter, bdev); if (unlikely(ret)) { - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); break; } if (iocb->ki_flags & IOCB_NOWAIT) { diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index f6d6276974ee..32639e8ea72a 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1491,8 +1491,7 @@ static inline void drbd_submit_bio_noacct(struct drbd= _device *device, __release(local); if (!bio->bi_bdev) { drbd_err(device, "drbd_submit_bio_noacct: bio->bi_bdev =3D=3D NULL\n"); - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return; } =20 diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 1d33e40d26ea..7ad7c778d8ff 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -940,8 +940,7 @@ static inline void closure_bio_submit(struct cache_set = *c, { closure_get(cl); if (unlikely(test_bit(CACHE_SET_IO_DISABLE, &c->flags))) { - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return; } submit_bio_noacct(bio); diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index af345dc6fde1..acccecd061ea 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -1192,8 +1192,7 @@ void cached_dev_submit_bio(struct bio *bio) =20 if (unlikely((d->c && test_bit(CACHE_SET_IO_DISABLE, &d->c->flags)) || dc->io_disable)) { - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return; } =20 @@ -1296,8 +1295,7 @@ void flash_dev_submit_bio(struct bio *bio) struct bcache_device *d =3D bio->bi_bdev->bd_disk->private_data; =20 if (unlikely(d->c && test_bit(CACHE_SET_IO_DISABLE, &d->c->flags))) { - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return; } =20 diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index aaf4a0a4b0eb..1424ef75d088 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -719,8 +719,7 @@ static void process_queued_bios(struct work_struct *wor= k) r =3D __multipath_map_bio(m, bio, mpio); switch (r) { case DM_MAPIO_KILL: - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); break; case DM_MAPIO_REQUEUE: bio->bi_status =3D BLK_STS_DM_REQUEUE; diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index d8de4a3076a1..4f70e2673e4b 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -1877,8 +1877,7 @@ static void __writecache_writeback_pmem(struct dm_wri= tecache *wc, struct writeba if (WC_MODE_FUA(wc)) bio->bi_opf |=3D REQ_FUA; if (writecache_has_error(wc)) { - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); } else if (unlikely(!bio_sectors(bio))) { bio->bi_status =3D BLK_STS_OK; bio_endio(bio); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index b45eace879d7..6444d572f0c7 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -4090,8 +4090,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) if (fio->bio && *(fio->bio)) { struct bio *bio =3D *(fio->bio); =20 - bio->bi_status =3D BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); *(fio->bio) =3D NULL; } return err; --=20 2.51.0