diff options
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 0f143094ef1d..bc8f27cc4483 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -1154,14 +1154,6 @@ static int blkdev_close(struct inode * inode, struct file * filp) | |||
1154 | return blkdev_put(bdev); | 1154 | return blkdev_put(bdev); |
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | static ssize_t blkdev_file_write(struct file *file, const char __user *buf, | ||
1158 | size_t count, loff_t *ppos) | ||
1159 | { | ||
1160 | struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count }; | ||
1161 | |||
1162 | return generic_file_write_nolock(file, &local_iov, 1, ppos); | ||
1163 | } | ||
1164 | |||
1165 | static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) | 1157 | static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) |
1166 | { | 1158 | { |
1167 | return blkdev_ioctl(file->f_mapping->host, file, cmd, arg); | 1159 | return blkdev_ioctl(file->f_mapping->host, file, cmd, arg); |
@@ -1181,8 +1173,8 @@ const struct file_operations def_blk_fops = { | |||
1181 | .open = blkdev_open, | 1173 | .open = blkdev_open, |
1182 | .release = blkdev_close, | 1174 | .release = blkdev_close, |
1183 | .llseek = block_llseek, | 1175 | .llseek = block_llseek, |
1184 | .read = generic_file_read, | 1176 | .read = do_sync_read, |
1185 | .write = blkdev_file_write, | 1177 | .write = do_sync_write, |
1186 | .aio_read = generic_file_aio_read, | 1178 | .aio_read = generic_file_aio_read, |
1187 | .aio_write = generic_file_aio_write_nolock, | 1179 | .aio_write = generic_file_aio_write_nolock, |
1188 | .mmap = generic_file_mmap, | 1180 | .mmap = generic_file_mmap, |