Received-SPF: pass (google.com: domain of linux-kernel+bounces-172644-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 8 May 2024 13:02:07 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Christian Brauner
 <brauner@kernel.org>, Christoph Hellwig <hch@lst.de>, Linux Kernel Mailing
 List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the block tree with the vfs-brauner
 tree
Message-ID: <20240508130207.3d83702f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/X84bEj4TZydhZxfVv0cdEua";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/X84bEj4TZydhZxfVv0cdEua
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the block tree got a conflict in:

  block/ioctl.c

between commit:

  695eaf683e8e ("blk_ioctl_{discard,zeroout}(): we only want ->bd_inode->i_=
mapping here...")

from the vfs-brauner tree and commits:

  719c15a75ebf ("blk-lib: check for kill signal in ioctl BLKDISCARD")
  fb4271f2bfac ("Merge branch 'for-6.10/block' into for-next")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc block/ioctl.c
index 3b31c09941dc,c0f1b6583a9a..000000000000
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@@ -95,8 -95,13 +95,12 @@@ static int compat_blkpg_ioctl(struct bl
  static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
  		unsigned long arg)
  {
+ 	unsigned int bs_mask =3D bdev_logical_block_size(bdev) - 1;
  	uint64_t range[2];
  	uint64_t start, len, end;
 -	struct inode *inode =3D bdev->bd_inode;
+ 	struct bio *prev =3D NULL, *bio;
+ 	sector_t sector, nr_sects;
+ 	struct blk_plug plug;
  	int err;
 =20
  	if (!(mode & BLK_OPEN_WRITE))
@@@ -124,9 -131,34 +130,34 @@@
  	err =3D truncate_bdev_range(bdev, mode, start, start + len - 1);
  	if (err)
  		goto fail;
- 	err =3D blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
+=20
+ 	sector =3D start >> SECTOR_SHIFT;
+ 	nr_sects =3D len >> SECTOR_SHIFT;
+=20
+ 	blk_start_plug(&plug);
+ 	while (1) {
+ 		if (fatal_signal_pending(current)) {
+ 			if (prev)
+ 				bio_await_chain(prev);
+ 			err =3D -EINTR;
+ 			goto out_unplug;
+ 		}
+ 		bio =3D blk_alloc_discard_bio(bdev, &sector, &nr_sects,
+ 				GFP_KERNEL);
+ 		if (!bio)
+ 			break;
+ 		prev =3D bio_chain_and_submit(prev, bio);
+ 	}
+ 	if (prev) {
+ 		err =3D submit_bio_wait(prev);
+ 		if (err =3D=3D -EOPNOTSUPP)
+ 			err =3D 0;
+ 		bio_put(prev);
+ 	}
+ out_unplug:
+ 	blk_finish_plug(&plug);
  fail:
 -	filemap_invalidate_unlock(inode->i_mapping);
 +	filemap_invalidate_unlock(bdev->bd_mapping);
  	return err;
  }
 =20

--Sig_/X84bEj4TZydhZxfVv0cdEua
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY66y8ACgkQAVBC80lX
0GzcEwf9FfHtra+chFIi3ZeHfu7NdGK2tb5O6kAMDLTwLwQdQmJ9u/Dj18rEoiM4
o10As2KLpPWYnukJsqy1uQidCKAvalSZDRp3tO0EPuHld78HOG3MuJye1Tk7MjJF
LK9hsbNrfbFmPxsuDBey3/Ref1RGVRrkpY7hd1v1A63cgY1ajMD2012XSFBhDCGt
07zy9D8sZAirLgUAEjQDFyVBYDbze2kVMFylmLtSsXpRkEJP1vwIJVJKQxFizc/o
x66UyJMNvghATxlzSiiEGaLc6z/KvseoJqt+1m9xdeWlrdNIZjctgB1FRdo4b02P
nOlO1xAwwuibi3w5QZsCOFCHGJtDXg==
=Ohqx
-----END PGP SIGNATURE-----

--Sig_/X84bEj4TZydhZxfVv0cdEua--