diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-23 16:16:29 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-23 16:16:29 -0400 |
commit | a53311d4d9e1cde15aebc2048847ea19fb33ac3a (patch) | |
tree | 08dd1744aef2dab2a4daf9f37914faf017724f1e /fs/gfs2/ops_file.c | |
parent | a464418425192da270a9944d0e48c33e186af601 (diff) |
[GFS2] Use generic_file_sendfile directly
Don't use a wrapper for generic_file_sendfile but call it
directly.
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.c')
-rw-r--r-- | fs/gfs2/ops_file.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 5e754198f5bb..ecef76e8373a 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
@@ -859,24 +859,6 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) | |||
859 | return gfs2_lm_plock(sdp, &name, file, cmd, fl); | 859 | return gfs2_lm_plock(sdp, &name, file, cmd, fl); |
860 | } | 860 | } |
861 | 861 | ||
862 | /** | ||
863 | * gfs2_sendfile - Send bytes to a file or socket | ||
864 | * @in_file: The file to read from | ||
865 | * @out_file: The file to write to | ||
866 | * @count: The amount of data | ||
867 | * @offset: The beginning file offset | ||
868 | * | ||
869 | * Outputs: offset - updated according to number of bytes read | ||
870 | * | ||
871 | * Returns: The number of bytes sent, errno on failure | ||
872 | */ | ||
873 | |||
874 | static ssize_t gfs2_sendfile(struct file *in_file, loff_t *offset, size_t count, | ||
875 | read_actor_t actor, void *target) | ||
876 | { | ||
877 | return generic_file_sendfile(in_file, offset, count, actor, target); | ||
878 | } | ||
879 | |||
880 | static int do_flock(struct file *file, int cmd, struct file_lock *fl) | 862 | static int do_flock(struct file *file, int cmd, struct file_lock *fl) |
881 | { | 863 | { |
882 | struct gfs2_file *fp = file->private_data; | 864 | struct gfs2_file *fp = file->private_data; |
@@ -982,7 +964,7 @@ struct file_operations gfs2_file_fops = { | |||
982 | .release = gfs2_close, | 964 | .release = gfs2_close, |
983 | .fsync = gfs2_fsync, | 965 | .fsync = gfs2_fsync, |
984 | .lock = gfs2_lock, | 966 | .lock = gfs2_lock, |
985 | .sendfile = gfs2_sendfile, | 967 | .sendfile = generic_file_sendfile, |
986 | .flock = gfs2_flock, | 968 | .flock = gfs2_flock, |
987 | .splice_read = generic_file_splice_read, | 969 | .splice_read = generic_file_splice_read, |
988 | .splice_write = generic_file_splice_write, | 970 | .splice_write = generic_file_splice_write, |