Received-SPF: pass (google.com: domain of linux-kernel+bounces-178236-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 14 May 2024 11:26:22 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>, Christoph Hellwig <hch@lst.de>,
 Jens Axboe <axboe@kernel.dk>, 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 vfs tree with Linus' tree
Message-ID: <20240514112622.63021dce@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_//SomYFN01wtONHPhVXDx5rV";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  block/ioctl.c

between commits:

  30f1e7241422 ("block: move discard checks into the ioctl handler")
  719c15a75ebf ("blk-lib: check for kill signal in ioctl BLKDISCARD")
  0c9f4ac808b0 ("Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk=
/linux")

from Linus' tree and commit:

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

from the vfs 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 c7db3bd2d653,0513fbe90280..000000000000
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@@ -95,12 -95,8 +95,11 @@@ static int compat_blkpg_ioctl(struct bl
  static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
  		unsigned long arg)
  {
 -	uint64_t range[2];
 -	uint64_t start, len, end;
 +	unsigned int bs_mask =3D bdev_logical_block_size(bdev) - 1;
- 	struct inode *inode =3D bdev->bd_inode;
 +	uint64_t range[2], start, len, end;
 +	struct bio *prev =3D NULL, *bio;
 +	sector_t sector, nr_sects;
 +	struct blk_plug plug;
  	int err;
 =20
  	if (!(mode & BLK_OPEN_WRITE))
@@@ -130,34 -124,9 +129,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);
 +
 +	sector =3D start >> SECTOR_SHIFT;
 +	nr_sects =3D len >> SECTOR_SHIFT;
 +
 +	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_//SomYFN01wtONHPhVXDx5rV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCvb4ACgkQAVBC80lX
0Gx0xAf/ZdxY+yVGz90SjSSJdIHPqCwcqsdkW9lTDCj/ype7aXjsrZomSZEm14yd
w55rNd7ZRdee7ZUsCOSzX5wodX/OPxDdsDHH9DsOAFj0D35lIsYp1fMXOtGiDGbL
yv2p/GtWP4woPvWeVc+KehSTdj5I6mYlhSUrel5JG5a+D+Y9IzusqP26j+FFoozT
aDNRSJppDwoxzPJq/FftTCyTTRYfjEe3vcdQWpV4qvBDNgXMOc3pKDwxgCWvfx3f
qwBtSqE5V955AHrn3TElS2P8V/T7R9TzTKl4e7rdjHzQJGZWurYIgA1kTIyduezd
M8mA3QBVHK6DOUSHLGBdDHnb7merVQ==
=p/7N
-----END PGP SIGNATURE-----

--Sig_//SomYFN01wtONHPhVXDx5rV--