]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'atomic_writes-6.16' into xfs-6.16-merge
authorCarlos Maiolino <cem@kernel.org>
Wed, 14 May 2025 10:38:53 +0000 (12:38 +0200)
committerCarlos Maiolino <cem@kernel.org>
Wed, 14 May 2025 10:38:53 +0000 (12:38 +0200)
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>
1  2 
fs/xfs/xfs_buf.c

index 5ae77ffdc947b1929d9fee33745f2c6443c58fb8,d52d9587b42c66b6ad8fd6c12fd7b26b7be53348..433329626e992c63cc09c28e1aa86de7bb79bfa5
@@@ -1733,11 -1765,10 +1765,14 @@@ xfs_configure_buftarg
                return -EINVAL;
        }
  
 -      return 0;
 +      /*
 +       * 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 sync_blockdev(btp->bt_bdev);
  }
  
  int