diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
| commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
| tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /fs/ceph/file.c | |
| parent | sched/cputime: Simplify task_cputime() (diff) | |
| parent | Merge tag 'trace-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| download | linux-0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1.tar.xz linux-0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 18630e800208..f995e3528a33 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1770,7 +1770,6 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, |