summaryrefslogtreecommitdiff
path: root/kernel/relay.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-12 23:27:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-12 23:27:20 +0300
commit5f739e4a491ab63730ef3b7464171340c689fbff (patch)
tree0ebf797a2b43ebefac2e5d0ef113b12a57c2b964 /kernel/relay.c
parenta667cb7a94d48a483fb5d6006fe04a440f1a42ce (diff)
parent12e1e7af1a55b9f911025365af4c689b3933c22a (diff)
downloadlinux-5f739e4a491ab63730ef3b7464171340c689fbff.tar.xz
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro: "Assorted fixes (really no common topic here)" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: Make __vfs_write() static vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1 pipe: stop using ->can_merge splice: don't merge into linked buffers fs: move generic stat response attr handling to vfs_getattr_nosec orangefs: don't reinitialize result_mask in ->getattr fs/devpts: always delete dcache dentry-s in dput()
Diffstat (limited to 'kernel/relay.c')
-rw-r--r--kernel/relay.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index 9e0f52375487..ade14fb7ce2e 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1177,7 +1177,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
}
static const struct pipe_buf_operations relay_pipe_buf_ops = {
- .can_merge = 0,
.confirm = generic_pipe_buf_confirm,
.release = relay_pipe_buf_release,
.steal = generic_pipe_buf_steal,