Merge tag 'pull-set_blocksize' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 15:34:51 +0000 (08:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 15:34:51 +0000 (08:34 -0700)
Pull vfs blocksize updates from Al Viro:
 "This gets rid of bogus set_blocksize() uses, switches it over
  to be based on a 'struct file *' and verifies that the caller
  has the device opened exclusively"

* tag 'pull-set_blocksize' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  make set_blocksize() fail unless block device is opened exclusive
  set_blocksize(): switch to passing struct file *
  btrfs_get_bdev_and_sb(): call set_blocksize() only for exclusive opens
  swsusp: don't bother with setting block size
  zram: don't bother with reopening - just use O_EXCL for open
  swapon(2): open swap with O_EXCL
  swapon(2)/swapoff(2): don't bother with block size
  pktcdvd: sort set_blocksize() calls out
  bcache_register(): don't bother with set_blocksize()

1  2 
Documentation/filesystems/porting.rst
block/bdev.c
block/ioctl.c
drivers/block/zram/zram_drv.c
drivers/md/bcache/super.c
fs/btrfs/volumes.c
fs/ext4/super.c
fs/xfs/xfs_buf.c
include/linux/blkdev.h
include/linux/swap.h
mm/swapfile.c

Simple merge
diff --cc block/bdev.c
Simple merge
diff --cc block/ioctl.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/swapfile.c
Simple merge