X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fblock_dev.c;h=1e86823a9cbda37f8451269d91a50f90d00c9566;hb=95f75e91588afecfb0090988393653d21f5d1f91;hp=1173a4ee0830a41fd39d1546921af239645d9507;hpb=20e029d791b22000c45ac7ce5a09e8dee8a3d323;p=karo-tx-linux.git diff --git a/fs/block_dev.c b/fs/block_dev.c index 1173a4ee0830..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) return bdev; } -static inline int sb_is_blkdev_sb(struct super_block *sb) +int sb_is_blkdev_sb(struct super_block *sb) { return sb == blockdev_superblock; } @@ -1542,7 +1542,7 @@ static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov, return 0; size -= pos; - if (size < iocb->ki_left) + if (size < iocb->ki_nbytes) nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size); return generic_file_aio_read(iocb, iov, nr_segs, pos); }