diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-05-21 08:34:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-05-21 08:34:51 -0700 |
| commit | 5ad8b6ad9a08abdbc8c57a51a5faaf2ef1afc547 (patch) | |
| tree | d5715cafab942ba34490be286633cb975088acde /include | |
| parent | fs/pidfs: make 'lsof' happy with our inode changes (diff) | |
| parent | make set_blocksize() fail unless block device is opened exclusive (diff) | |
| download | linux-5ad8b6ad9a08abdbc8c57a51a5faaf2ef1afc547.tar.gz linux-5ad8b6ad9a08abdbc8c57a51a5faaf2ef1afc547.tar.bz2 linux-5ad8b6ad9a08abdbc8c57a51a5faaf2ef1afc547.zip | |
Merge tag 'pull-set_blocksize' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/swap.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index fd5951dd6b7d..a0c972e5280b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1481,7 +1481,7 @@ static inline void bio_end_io_acct(struct bio *bio, unsigned long start_time) } int bdev_read_only(struct block_device *bdev); -int set_blocksize(struct block_device *bdev, int size); +int set_blocksize(struct file *file, int size); int lookup_bdev(const char *pathname, dev_t *dev); diff --git a/include/linux/swap.h b/include/linux/swap.h index 6b672a67ae5d..bd450023b9a4 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -310,10 +310,8 @@ struct swap_info_struct { unsigned int __percpu *cluster_next_cpu; /*percpu index for next allocation */ struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */ struct rb_root swap_extent_root;/* root of the swap extent rbtree */ - struct file *bdev_file; /* open handle of the bdev */ struct block_device *bdev; /* swap device or bdev of swap file */ struct file *swap_file; /* seldom referenced */ - unsigned int old_block_size; /* seldom referenced */ struct completion comp; /* seldom referenced */ spinlock_t lock; /* * protect map scan related fields like |