xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iocb' into for-next

Browse Source
This commit is contained in:
Al Viro
2015-04-11 22:24:41 -04:00
parent c1b8940b42 e2e40f2c1e
commit c0fec3a98b
68 changed files with 201 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/direct.c
View File

@@ -265,7 +265,7 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t
return -EINVAL;
#else
VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE);
VM_BUG_ON(iov_iter_count(iter) != PAGE_SIZE);
if (rw == READ)
return nfs_file_direct_read(iocb, iter, pos);
@@ -393,7 +393,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write)
long res = (long) dreq->error;
if (!res)
res = (long) dreq->count;
aio_complete(dreq->iocb, res, 0);
dreq->iocb->ki_complete(dreq->iocb, res, 0);
}
complete_all(&dreq->completion);