diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2007-06-04 04:25:05 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-10 02:04:15 -0400 |
commit | d6f517568f9f5c26e7404a336c7289d5b4b293ec (patch) | |
tree | 46fc69e6c0909caea988f3b5fe84de1c54b289ff | |
parent | ae976416464b741913a13eea62eb6953ee065733 (diff) |
sendfile: remove bad_sendfile() from bad_file_ops
do_sendfile() prefers splice over sendfile, so it should not trigger
(directly, at least).
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r-- | fs/bad_inode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 329ee473eede..521ff7caadbd 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c | |||
@@ -114,12 +114,6 @@ static int bad_file_lock(struct file *file, int cmd, struct file_lock *fl) | |||
114 | return -EIO; | 114 | return -EIO; |
115 | } | 115 | } |
116 | 116 | ||
117 | static ssize_t bad_file_sendfile(struct file *in_file, loff_t *ppos, | ||
118 | size_t count, read_actor_t actor, void *target) | ||
119 | { | ||
120 | return -EIO; | ||
121 | } | ||
122 | |||
123 | static ssize_t bad_file_sendpage(struct file *file, struct page *page, | 117 | static ssize_t bad_file_sendpage(struct file *file, struct page *page, |
124 | int off, size_t len, loff_t *pos, int more) | 118 | int off, size_t len, loff_t *pos, int more) |
125 | { | 119 | { |
@@ -182,7 +176,6 @@ static const struct file_operations bad_file_ops = | |||
182 | .aio_fsync = bad_file_aio_fsync, | 176 | .aio_fsync = bad_file_aio_fsync, |
183 | .fasync = bad_file_fasync, | 177 | .fasync = bad_file_fasync, |
184 | .lock = bad_file_lock, | 178 | .lock = bad_file_lock, |
185 | .sendfile = bad_file_sendfile, | ||
186 | .sendpage = bad_file_sendpage, | 179 | .sendpage = bad_file_sendpage, |
187 | .get_unmapped_area = bad_file_get_unmapped_area, | 180 | .get_unmapped_area = bad_file_get_unmapped_area, |
188 | .check_flags = bad_file_check_flags, | 181 | .check_flags = bad_file_check_flags, |