Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block

[~andy/linux] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 37967bcea05c10be626bc9a3c55d882ebb119adf..b3c1d3dae77d06fcde3fa3ecf36b2af9e2b25d85 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -132,8 +132,7 @@ int set_blocksize(struct block_device *bdev, int size)
        /* Check that the block device is not memory mapped */
        mapping = bdev->bd_inode->i_mapping;
        mutex_lock(&mapping->i_mmap_mutex);
-       if (!prio_tree_empty(&mapping->i_mmap) ||
-           !list_empty(&mapping->i_mmap_nonlinear)) {
+       if (mapping_mapped(mapping)) {
                mutex_unlock(&mapping->i_mmap_mutex);
                percpu_up_write(&bdev->bd_block_size_semaphore);
                return -EBUSY;