From: Carlos Maiolino <cem@kernel.org>
Date: Wed, 14 May 2025 10:38:53 +0000 (+0200)
Subject: Merge branch 'atomic_writes-6.16' into xfs-6.16-merge
X-Git-Tag: v6.16-rc1~209^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e7d71b3a0f9732863b6a1366c9d875cec52c842;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'atomic_writes-6.16' into xfs-6.16-merge

Required update due to conflict with patch:
	xfs: stop using set_blocksize

 Conflicts:
	fs/xfs/xfs_buf.c

Signed-off-by: Carlos Maiolino <cem@kernel.org>
---

6e7d71b3a0f9732863b6a1366c9d875cec52c842
diff --cc fs/xfs/xfs_buf.c
index 5ae77ffdc947b,d52d9587b42c6..433329626e992
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -1733,11 -1765,10 +1765,14 @@@ xfs_configure_buftarg
  		return -EINVAL;
  	}
  
 +	/*
 +	 * Flush the block device pagecache so our bios see anything dirtied
 +	 * before mount.
 +	 */
+ 	if (bdev_can_atomic_write(btp->bt_bdev))
+ 		xfs_configure_buftarg_atomic_writes(btp);
+ 
 -	return 0;
 +	return sync_blockdev(btp->bt_bdev);
  }
  
  int