projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
direct_IO: use iov_iter_rw() instead of rw everywhere
[deliverable/linux.git]
/
fs
/
nfs
/
direct.c
diff --git
a/fs/nfs/direct.c
b/fs/nfs/direct.c
index 7077521acdf4609cc57f54da4ce11bb331493632..e8482b8f48302ad74255cc9b62bdbd7aca653819 100644
(file)
--- a/
fs/nfs/direct.c
+++ b/
fs/nfs/direct.c
@@
-265,9
+265,9
@@
ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t
return -EINVAL;
#else
return -EINVAL;
#else
- VM_BUG_ON(io
cb->ki_nbytes
!= PAGE_SIZE);
+ VM_BUG_ON(io
v_iter_count(iter)
!= PAGE_SIZE);
- if (
rw
== READ)
+ if (
iov_iter_rw(iter)
== READ)
return nfs_file_direct_read(iocb, iter, pos);
return nfs_file_direct_write(iocb, iter, pos);
#endif /* CONFIG_NFS_SWAP */
return nfs_file_direct_read(iocb, iter, pos);
return nfs_file_direct_write(iocb, iter, pos);
#endif /* CONFIG_NFS_SWAP */
@@
-283,7
+283,7
@@
static void nfs_direct_release_pages(struct page **pages, unsigned int npages)
void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
struct nfs_direct_req *dreq)
{
void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
struct nfs_direct_req *dreq)
{
- cinfo->lock = &dreq->lock;
+ cinfo->lock = &dreq->
inode->i_
lock;
cinfo->mds = &dreq->mds_cinfo;
cinfo->ds = &dreq->ds_cinfo;
cinfo->dreq = dreq;
cinfo->mds = &dreq->mds_cinfo;
cinfo->ds = &dreq->ds_cinfo;
cinfo->dreq = dreq;
@@
-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;
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);
}
complete_all(&dreq->completion);
This page took
0.026692 seconds
and
5
git commands to generate.