lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove remnants of sendfile()

Browse Source 
There are now zero users of .sendfile() in the kernel, so kill
it from the file_operations structure and in do_sendfile().

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2007-06-11 12:18:52 +02:00
parent d054fe3d10
commit d96e6e7164
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/read_write.c
View File

@@ -724,8 +724,7 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
in_inode = in_file->f_path.dentry->d_inode; in_inode = in_file->f_path.dentry->d_inode;
if (!in_inode) if (!in_inode)
goto fput_in; goto fput_in;
if (!in_file->f_op || (!in_file->f_op->sendfile && if (!in_file->f_op || !in_file->f_op->splice_read)
!in_file->f_op->splice_read))
goto fput_in; goto fput_in;
retval = -ESPIPE; retval = -ESPIPE;
if (!ppos) if (!ppos)
@@ -778,21 +777,18 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
count = max - pos; count = max - pos;
} }
if (in_file->f_op->splice_read) { fl = 0;
fl = 0;
#if 0 #if 0
/* /*
* We need to debate whether we can enable this or not. The * We need to debate whether we can enable this or not. The
* man page documents EAGAIN return for the output at least, * man page documents EAGAIN return for the output at least,
* and the application is arguably buggy if it doesn't expect * and the application is arguably buggy if it doesn't expect
* EAGAIN on a non-blocking file descriptor. * EAGAIN on a non-blocking file descriptor.
*/ */
if (in_file->f_flags & O_NONBLOCK) if (in_file->f_flags & O_NONBLOCK)
fl = SPLICE_F_NONBLOCK; fl = SPLICE_F_NONBLOCK;
#endif #endif
retval = do_splice_direct(in_file, ppos, out_file, count, fl); retval = do_splice_direct(in_file, ppos, out_file, count, fl);
} else
retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
if (retval > 0) { if (retval > 0) {
add_rchar(current, retval); add_rchar(current, retval);

3
include/linux/fs.h
View File

@@ -1054,7 +1054,7 @@ struct block_device_operations {
}; };
/* /*
* "descriptor" for what we're up to with a read for sendfile(). * "descriptor" for what we're up to with a read.
* This allows us to use the same read code yet * This allows us to use the same read code yet
* have multiple different users of the data that * have multiple different users of the data that
* we read from a file. * we read from a file.
@@ -1105,7 +1105,6 @@ struct file_operations {
int (*aio_fsync) (struct kiocb *, int datasync); int (*aio_fsync) (struct kiocb *, int datasync);
int (*fasync) (int, struct file *, int); int (*fasync) (int, struct file *, int);
int (*lock) (struct file *, int, struct file_lock *); int (*lock) (struct file *, int, struct file_lock *);
ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *);
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);