diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-06-01 11:49:19 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-10 08:04:13 +0200 |
| commit | 5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496 (patch) | |
| tree | 437ec32a58ac5e4794565b2bbb3da6611f0d6a04 /fs/smbfs | |
| parent | sys_sendfile: switch to using ->splice_read, if available (diff) | |
| download | linux-5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496.tar.xz linux-5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496.zip | |
sendfile: remove .sendfile from filesystems that use generic_file_sendfile()
They can use generic_file_splice_read() instead. Since sys_sendfile() now
prefers that, there should be no change in behaviour.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/file.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c index aea3f8aa54c0..c5d78a7e492b 100644 --- a/fs/smbfs/file.c +++ b/fs/smbfs/file.c @@ -262,8 +262,9 @@ out: } static ssize_t -smb_file_sendfile(struct file *file, loff_t *ppos, - size_t count, read_actor_t actor, void *target) +smb_file_splice_read(struct file *file, loff_t *ppos, + struct pipe_inode_info *pipe, size_t count, + unsigned int flags) { struct dentry *dentry = file->f_path.dentry; ssize_t status; @@ -277,7 +278,7 @@ smb_file_sendfile(struct file *file, loff_t *ppos, DENTRY_PATH(dentry), status); goto out; } - status = generic_file_sendfile(file, ppos, count, actor, target); + status = generic_file_splice_read(file, ppos, pipe, count, flags); out: return status; } @@ -416,7 +417,7 @@ const struct file_operations smb_file_operations = .open = smb_file_open, .release = smb_file_release, .fsync = smb_fsync, - .sendfile = smb_file_sendfile, + .splice_read = smb_file_splice_read, }; const struct inode_operations smb_file_inode_operations = |