tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fs/splice.c: remove unneeded exports
ocfs2 was using a bunch of splice.c guts...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+5
-20
+5
-10
fs/splice.c
+5
-10
fs/splice.c
···
738
738
* SPLICE_F_MOVE isn't set, or we cannot move the page, we simply create
739
739
* a new page in the output file page cache and fill/dirty that.
740
740
*/
741
-
int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
741
+
static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
742
742
struct splice_desc *sd)
743
743
{
744
744
struct file *file = sd->u.file;
···
773
773
out:
774
774
return ret;
775
775
}
776
-
EXPORT_SYMBOL(pipe_to_file);
777
776
778
777
static void wakeup_pipe_writers(struct pipe_inode_info *pipe)
779
778
{
···
802
803
* locking is required around copying the pipe buffers to the
803
804
* destination.
804
805
*/
805
-
int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
806
+
static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
806
807
splice_actor *actor)
807
808
{
808
809
int ret;
···
849
850
850
851
return 1;
851
852
}
852
-
EXPORT_SYMBOL(splice_from_pipe_feed);
853
853
854
854
/**
855
855
* splice_from_pipe_next - wait for some data to splice from
···
860
862
* value (one) if pipe buffers are available. It will return zero
861
863
* or -errno if no more data needs to be spliced.
862
864
*/
863
-
int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
865
+
static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
864
866
{
865
867
while (!pipe->nrbufs) {
866
868
if (!pipe->writers)
···
885
887
886
888
return 1;
887
889
}
888
-
EXPORT_SYMBOL(splice_from_pipe_next);
889
890
890
891
/**
891
892
* splice_from_pipe_begin - start splicing from pipe
···
895
898
* splice_from_pipe_next() and splice_from_pipe_feed() to
896
899
* initialize the necessary fields of @sd.
897
900
*/
898
-
void splice_from_pipe_begin(struct splice_desc *sd)
901
+
static void splice_from_pipe_begin(struct splice_desc *sd)
899
902
{
900
903
sd->num_spliced = 0;
901
904
sd->need_wakeup = false;
902
905
}
903
-
EXPORT_SYMBOL(splice_from_pipe_begin);
904
906
905
907
/**
906
908
* splice_from_pipe_end - finish splicing from pipe
···
911
915
* be called after a loop containing splice_from_pipe_next() and
912
916
* splice_from_pipe_feed().
913
917
*/
914
-
void splice_from_pipe_end(struct pipe_inode_info *pipe, struct splice_desc *sd)
918
+
static void splice_from_pipe_end(struct pipe_inode_info *pipe, struct splice_desc *sd)
915
919
{
916
920
if (sd->need_wakeup)
917
921
wakeup_pipe_writers(pipe);
918
922
}
919
-
EXPORT_SYMBOL(splice_from_pipe_end);
920
923
921
924
/**
922
925
* __splice_from_pipe - splice data from a pipe to given actor
-10
include/linux/splice.h
-10
include/linux/splice.h
···
70
70
splice_actor *);
71
71
extern ssize_t __splice_from_pipe(struct pipe_inode_info *,
72
72
struct splice_desc *, splice_actor *);
73
-
extern int splice_from_pipe_feed(struct pipe_inode_info *, struct splice_desc *,
74
-
splice_actor *);
75
-
extern int splice_from_pipe_next(struct pipe_inode_info *,
76
-
struct splice_desc *);
77
-
extern void splice_from_pipe_begin(struct splice_desc *);
78
-
extern void splice_from_pipe_end(struct pipe_inode_info *,
79
-
struct splice_desc *);
80
-
extern int pipe_to_file(struct pipe_inode_info *, struct pipe_buffer *,
81
-
struct splice_desc *);
82
-
83
73
extern ssize_t splice_to_pipe(struct pipe_inode_info *,
84
74
struct splice_pipe_desc *);
85
75
extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,