Hi Benjamin,
Today's linux-next merge of the aio tree got a conflict in fs/block_dev.c
between commit b176eedb2a8b ("block_dev: add support for read_iter,
write_iter") from the aio-direct tree and commit 73a7075e3f6e ("aio: Kill
aio_rw_vect_retry()") from the aio tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc fs/block_dev.c index 89d8ec5,8772b15..0000000 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@@ -1541,9 -1542,9 +1541,9 @@@ static ssize_t blkdev_read_iter(struct 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); + iov_iter_shorten(iter, size); + return generic_file_read_iter(iocb, iter, pos); } /*
pgpXGC5kgTy1a.pgp
Description: PGP signature
