projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
ceph
/
addr.c
diff --git
a/fs/ceph/addr.c
b/fs/ceph/addr.c
index 65a30e817dd80ab9c7264ade89b9cae563998465..4f3f69079f362280379edf3b13c4766247c764fa 100644
(file)
--- a/
fs/ceph/addr.c
+++ b/
fs/ceph/addr.c
@@
-1187,8
+1187,8
@@
static int ceph_write_end(struct file *file, struct address_space *mapping,
* never get called.
*/
static ssize_t ceph_direct_io(int rw, struct kiocb *iocb,
-
const struct iovec *iov
,
- loff_t pos
, unsigned long nr_segs
)
+
struct iov_iter *iter
,
+ loff_t pos)
{
WARN_ON(1);
return -EINVAL;