make set_blocksize() fail unless block device is opened exclusive

Signed-off-by: Al Viro <[email protected]>

diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 1be76ef117b3f80051713c8dc24f0f2568248075..5503d5c614a7b7e84e406880c09117f3b22670e7 100644 (file)
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -1134,3 +1134,10 @@ superblock of the main block device, i.e., the one stored in sb->s_bdev. Block
 device freezing now works for any block device owned by a given superblock, not
 just the main block device. The get_active_super() helper and bd_fsfreeze_sb
 pointer are gone.
+
+---
+
+**mandatory**
+
+set_blocksize() takes opened struct file instead of struct block_device now
+and it *must* be opened exclusive.

diff --git a/block/bdev.c b/block/bdev.c
index a329ff9be11d8c5d5f4dc9c7f57861bf4b98d2dd..a89bce368b64f5c16b2308364403a3812dbe961d 100644 (file)
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -157,6 +157,9 @@ int set_blocksize(struct file *file, int size)
        if (size < bdev_logical_block_size(bdev))
                return -EINVAL;
 
+       if (!file->private_data)
+               return -EINVAL;
+
        /* Don't change the size if it is same as current */
        if (inode->i_blkbits != blksize_bits(size)) {
                sync_blockdev(bdev);