diff options
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index c7bda5cd3da7..1e86823a9cbd 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -592,7 +592,7 @@ static struct block_device *bd_acquire(struct inode *inode) | |||
592 | return bdev; | 592 | return bdev; |
593 | } | 593 | } |
594 | 594 | ||
595 | static inline int sb_is_blkdev_sb(struct super_block *sb) | 595 | int sb_is_blkdev_sb(struct super_block *sb) |
596 | { | 596 | { |
597 | return sb == blockdev_superblock; | 597 | return sb == blockdev_superblock; |
598 | } | 598 | } |
@@ -1519,7 +1519,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
1519 | 1519 | ||
1520 | blk_start_plug(&plug); | 1520 | blk_start_plug(&plug); |
1521 | ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); | 1521 | ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); |
1522 | if (ret > 0 || ret == -EIOCBQUEUED) { | 1522 | if (ret > 0) { |
1523 | ssize_t err; | 1523 | ssize_t err; |
1524 | 1524 | ||
1525 | err = generic_write_sync(file, pos, ret); | 1525 | err = generic_write_sync(file, pos, ret); |
@@ -1542,7 +1542,7 @@ static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
1542 | return 0; | 1542 | return 0; |
1543 | 1543 | ||
1544 | size -= pos; | 1544 | size -= pos; |
1545 | if (size < iocb->ki_left) | 1545 | if (size < iocb->ki_nbytes) |
1546 | nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size); | 1546 | nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size); |
1547 | return generic_file_aio_read(iocb, iov, nr_segs, pos); | 1547 | return generic_file_aio_read(iocb, iov, nr_segs, pos); |
1548 | } | 1548 | } |