projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
lustre
/
lustre
/
llite
/
llite_internal.h
diff --git
a/drivers/staging/lustre/lustre/llite/llite_internal.h
b/drivers/staging/lustre/lustre/llite/llite_internal.h
index dde7632ba01fa8dab671fb43995723bba1f5d3dd..140ee947ba4949ea547ac03ebaf9a9efb9e51ab1 100644
(file)
--- a/
drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/
drivers/staging/lustre/lustre/llite/llite_internal.h
@@
-917,8
+917,7
@@
struct vvp_io_args {
union {
struct {
struct kiocb *via_iocb;
- struct iovec *via_iov;
- unsigned long via_nrsegs;
+ struct iov_iter *via_iter;
} normal;
struct {
struct pipe_inode_info *via_pipe;