diff options
-rw-r--r-- | block/blk-sysfs.c | 7 | ||||
-rw-r--r-- | block/compat_ioctl.c | 2 | ||||
-rw-r--r-- | block/ioctl.c | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 21e275d7eed9..a29cb788e408 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
@@ -88,9 +88,7 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count) | |||
88 | unsigned long ra_kb; | 88 | unsigned long ra_kb; |
89 | ssize_t ret = queue_var_store(&ra_kb, page, count); | 89 | ssize_t ret = queue_var_store(&ra_kb, page, count); |
90 | 90 | ||
91 | spin_lock_irq(q->queue_lock); | ||
92 | q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10); | 91 | q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10); |
93 | spin_unlock_irq(q->queue_lock); | ||
94 | 92 | ||
95 | return ret; | 93 | return ret; |
96 | } | 94 | } |
@@ -117,10 +115,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) | |||
117 | 115 | ||
118 | if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb) | 116 | if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb) |
119 | return -EINVAL; | 117 | return -EINVAL; |
120 | /* | 118 | |
121 | * Take the queue lock to update the readahead and max_sectors | ||
122 | * values synchronously: | ||
123 | */ | ||
124 | spin_lock_irq(q->queue_lock); | 119 | spin_lock_irq(q->queue_lock); |
125 | q->max_sectors = max_sectors_kb << 1; | 120 | q->max_sectors = max_sectors_kb << 1; |
126 | spin_unlock_irq(q->queue_lock); | 121 | spin_unlock_irq(q->queue_lock); |
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 67eb93cff699..f87615dea46b 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c | |||
@@ -774,9 +774,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
774 | bdi = blk_get_backing_dev_info(bdev); | 774 | bdi = blk_get_backing_dev_info(bdev); |
775 | if (bdi == NULL) | 775 | if (bdi == NULL) |
776 | return -ENOTTY; | 776 | return -ENOTTY; |
777 | lock_kernel(); | ||
778 | bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; | 777 | bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; |
779 | unlock_kernel(); | ||
780 | return 0; | 778 | return 0; |
781 | case BLKGETSIZE: | 779 | case BLKGETSIZE: |
782 | size = bdev->bd_inode->i_size; | 780 | size = bdev->bd_inode->i_size; |
diff --git a/block/ioctl.c b/block/ioctl.c index d03985b04d67..0f22e629b13c 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
@@ -323,9 +323,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, | |||
323 | bdi = blk_get_backing_dev_info(bdev); | 323 | bdi = blk_get_backing_dev_info(bdev); |
324 | if (bdi == NULL) | 324 | if (bdi == NULL) |
325 | return -ENOTTY; | 325 | return -ENOTTY; |
326 | lock_kernel(); | ||
327 | bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; | 326 | bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; |
328 | unlock_kernel(); | ||
329 | return 0; | 327 | return 0; |
330 | case BLKBSZSET: | 328 | case BLKBSZSET: |
331 | /* set the logical block size */ | 329 | /* set the logical block size */ |