projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[cascardo/linux.git]
/
fs
/
9p
/
vfs_addr.c
diff --git
a/fs/9p/vfs_addr.c
b/fs/9p/vfs_addr.c
index
c71e886
..
cc1cfae
100644
(file)
--- a/
fs/9p/vfs_addr.c
+++ b/
fs/9p/vfs_addr.c
@@
-259,8
+259,7
@@
static int v9fs_launder_page(struct page *page)
*
*/
static ssize_t
*
*/
static ssize_t
-v9fs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
- loff_t pos, unsigned long nr_segs)
+v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
{
/*
* FIXME
{
/*
* FIXME
@@
-269,7
+268,7
@@
v9fs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
*/
p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%s) off/no(%lld/%lu) EINVAL\n",
iocb->ki_filp->f_path.dentry->d_name.name,
*/
p9_debug(P9_DEBUG_VFS, "v9fs_direct_IO: v9fs_direct_IO (%s) off/no(%lld/%lu) EINVAL\n",
iocb->ki_filp->f_path.dentry->d_name.name,
- (long long)pos, nr_segs);
+ (long long)pos,
iter->
nr_segs);
return -EINVAL;
}
return -EINVAL;
}