linux-kernel - linux-next: manual merge of the vfs-brauner tree with the xfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240227102827.313113cd@canb.auug.org.au>
Date: Tue, 27 Feb 2024 10:28:27 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, "Darrick J. Wong"
 <djwong@...nel.org>, David Chinner <david@...morbit.com>
Cc: <linux-xfs@...r.kernel.org>, Chandan Babu R <chandanbabu@...nel.org>,
 Dave Chinner <dchinner@...hat.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the xfs tree

Hi all,

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

  fs/xfs/xfs_buf.c

between commits:

  d4c75a1b40cd ("xfs: convert remaining kmem_free() to kfree()")
  5076a6040ca1 ("xfs: support in-memory buffer cache targets")

from the xfs tree and commit:

  1b9e2d90141c ("xfs: port block device access to files")

from the vfs-brauner 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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/xfs/xfs_buf.c
index 7fc26e64368d,01b41fabbe3c..000000000000
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -2030,8 -1951,9 +2030,8 @@@ xfs_free_buftarg
  	fs_put_dax(btp->bt_daxdev, btp->bt_mount);
  	/* the main block device is closed by kill_block_super */
  	if (btp->bt_bdev != btp->bt_mount->m_super->s_bdev)
- 		bdev_release(btp->bt_bdev_handle);
+ 		fput(btp->bt_bdev_file);
 -
 -	kmem_free(btp);
 +	kfree(btp);
  }

  int
@@@ -2095,20 -1994,20 +2095,20 @@@ out_destroy_lru
  struct xfs_buftarg *
  xfs_alloc_buftarg(
  	struct xfs_mount	*mp,
- 	struct bdev_handle	*bdev_handle)
+ 	struct file		*bdev_file)
  {
 -	xfs_buftarg_t		*btp;
 +	struct xfs_buftarg	*btp;
  	const struct dax_holder_operations *ops = NULL;

  #if defined(CONFIG_FS_DAX) && defined(CONFIG_MEMORY_FAILURE)
  	ops = &xfs_dax_holder_operations;
  #endif
 -	btp = kmem_zalloc(sizeof(*btp), KM_NOFS);
 +	btp = kzalloc(sizeof(*btp), GFP_KERNEL | __GFP_NOFAIL);

  	btp->bt_mount = mp;
- 	btp->bt_bdev_handle = bdev_handle;
- 	btp->bt_dev = bdev_handle->bdev->bd_dev;
- 	btp->bt_bdev = bdev_handle->bdev;
+ 	btp->bt_bdev_file = bdev_file;
+ 	btp->bt_bdev = file_bdev(bdev_file);
+ 	btp->bt_dev = btp->bt_bdev->bd_dev;
  	btp->bt_daxdev = fs_dax_get_by_bdev(btp->bt_bdev, &btp->bt_dax_part_off,
  					    mp, ops);

Content of type "application/pgp-signature" skipped