projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.uaccess' into for-linus
[cascardo/linux.git]
/
fs
/
nfs
/
nfs4file.c
diff --git
a/fs/nfs/nfs4file.c
b/fs/nfs/nfs4file.c
index
d085ad7
..
89a7795
100644
(file)
--- a/
fs/nfs/nfs4file.c
+++ b/
fs/nfs/nfs4file.c
@@
-248,7
+248,7
@@
const struct file_operations nfs4_file_operations = {
.fsync = nfs_file_fsync,
.lock = nfs_lock,
.flock = nfs_flock,
- .splice_read =
nfs
_file_splice_read,
+ .splice_read =
generic
_file_splice_read,
.splice_write = iter_file_splice_write,
.check_flags = nfs_check_flags,
.setlease = simple_nosetlease,