fs: make the pipe_buf_operations ->steal operation optional

Just return 1 for failure if it is not present.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/splice.c b/fs/splice.c
index fb9670e7fc1f07e4417574a991b4af7259dcedf6..6c19bda274c8f4eb48d511dd5a20483122983e1c 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -337,17 +337,10 @@ const struct pipe_buf_operations default_pipe_buf_ops = {
        .get = generic_pipe_buf_get,
 };
 
-int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe,
-                            struct pipe_buffer *buf)
-{
-       return 1;
-}
-
 /* Pipe buffer operations for a socket and similar. */
 const struct pipe_buf_operations nosteal_pipe_buf_ops = {
        .confirm = generic_pipe_buf_confirm,
        .release = generic_pipe_buf_release,
-       .steal = generic_pipe_buf_nosteal,
        .get = generic_pipe_buf_get,
 };
 EXPORT_SYMBOL(nosteal_pipe_buf_ops);

diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 3f7b07b38824931ab3e0bb1d2eaf8f4553a00cd2..e022b245930158324de881af83bb8da612d09840 100644 (file)
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -206,6 +206,8 @@ static inline int pipe_buf_confirm(struct pipe_inode_info *pipe,
 static inline int pipe_buf_steal(struct pipe_inode_info *pipe,
                                 struct pipe_buffer *buf)
 {
+       if (!buf->ops->steal)
+               return 1;
        return buf->ops->steal(pipe, buf);
 }
 
@@ -232,7 +234,6 @@ void free_pipe_info(struct pipe_inode_info *);
 bool generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
 int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *);
 int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *);
-int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
 
 extern const struct pipe_buf_operations nosteal_pipe_buf_ops;

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bc9783797d27590edad2b225e9aaf4aa8b165dd6..29fa25cfb6c26d0f3a80cf281e34b4edfce060c4 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7576,7 +7576,6 @@ static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
 static const struct pipe_buf_operations buffer_pipe_buf_ops = {
        .confirm                = generic_pipe_buf_confirm,
        .release                = buffer_pipe_buf_release,
-       .steal                  = generic_pipe_buf_nosteal,
        .get                    = buffer_pipe_buf_get,
 };
 

diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index 39d7b34d06d232229dc9f1619be40c65cfc5a6f4..5fe25279702d27b1111221bd0092cf3f0ea72207 100644 (file)
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -129,16 +129,9 @@ out:
        sock_put(sk);
 }
 
-static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe,
-                                  struct pipe_buffer *buf)
-{
-       return 1;
-}
-
 static const struct pipe_buf_operations smc_pipe_ops = {
        .confirm = generic_pipe_buf_confirm,
        .release = smc_rx_pipe_buf_release,
-       .steal = smc_rx_pipe_buf_nosteal,
        .get = generic_pipe_buf_get
 };