projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-microblaze.git]
/
fs
/
orangefs
/
file.c
diff --git
a/fs/orangefs/file.c
b/fs/orangefs/file.c
index
af375e0
..
ec8ae42
100644
(file)
--- a/
fs/orangefs/file.c
+++ b/
fs/orangefs/file.c
@@
-663,6
+663,8
@@
const struct file_operations orangefs_file_operations = {
.unlocked_ioctl = orangefs_ioctl,
.mmap = orangefs_file_mmap,
.open = generic_file_open,
.unlocked_ioctl = orangefs_ioctl,
.mmap = orangefs_file_mmap,
.open = generic_file_open,
+ .splice_read = generic_file_splice_read,
+ .splice_write = iter_file_splice_write,
.flush = orangefs_flush,
.release = orangefs_file_release,
.fsync = orangefs_fsync,
.flush = orangefs_flush,
.release = orangefs_file_release,
.fsync = orangefs_fsync,