diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-29 19:49:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-29 19:52:19 +0100 |
| commit | 1e8b33328a5407b447ff80953655a47014a6dcb9 (patch) | |
| tree | cb5a5f90712bafe8fb64d3d221fc5213c53f681f /drivers/char | |
| parent | fs/buffer.c: make block-size be per-page and protected by the page lock (diff) | |
| download | linux-1e8b33328a5407b447ff80953655a47014a6dcb9.tar.xz linux-1e8b33328a5407b447ff80953655a47014a6dcb9.zip | |
blockdev: remove bd_block_size_semaphore again
This reverts the block-device direct access code to the previous
unlocked code, now that fs/buffer.c no longer needs external locking.
With this, fs/block_dev.c is back to the original version, apart from a
whitespace cleanup that I didn't want to revert.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 0bb207eaef2f..54a3a6d09819 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -285,7 +285,7 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd, static const struct file_operations raw_fops = { .read = do_sync_read, - .aio_read = blkdev_aio_read, + .aio_read = generic_file_aio_read, .write = do_sync_write, .aio_write = blkdev_aio_write, .fsync = blkdev_fsync, |