diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-06-01 05:49:19 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-10 02:04:13 -0400 |
| commit | 5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496 (patch) | |
| tree | 437ec32a58ac5e4794565b2bbb3da6611f0d6a04 /fs/smbfs | |
| parent | 534f2aaa6ab07cd71164180bc958a7dcde41db11 (diff) | |
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: | |||
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | static ssize_t | 264 | static ssize_t |
| 265 | smb_file_sendfile(struct file *file, loff_t *ppos, | 265 | smb_file_splice_read(struct file *file, loff_t *ppos, |
| 266 | size_t count, read_actor_t actor, void *target) | 266 | struct pipe_inode_info *pipe, size_t count, |
| 267 | unsigned int flags) | ||
| 267 | { | 268 | { |
| 268 | struct dentry *dentry = file->f_path.dentry; | 269 | struct dentry *dentry = file->f_path.dentry; |
| 269 | ssize_t status; | 270 | ssize_t status; |
| @@ -277,7 +278,7 @@ smb_file_sendfile(struct file *file, loff_t *ppos, | |||
| 277 | DENTRY_PATH(dentry), status); | 278 | DENTRY_PATH(dentry), status); |
| 278 | goto out; | 279 | goto out; |
| 279 | } | 280 | } |
| 280 | status = generic_file_sendfile(file, ppos, count, actor, target); | 281 | status = generic_file_splice_read(file, ppos, pipe, count, flags); |
| 281 | out: | 282 | out: |
| 282 | return status; | 283 | return status; |
| 283 | } | 284 | } |
| @@ -416,7 +417,7 @@ const struct file_operations smb_file_operations = | |||
| 416 | .open = smb_file_open, | 417 | .open = smb_file_open, |
| 417 | .release = smb_file_release, | 418 | .release = smb_file_release, |
| 418 | .fsync = smb_fsync, | 419 | .fsync = smb_fsync, |
| 419 | .sendfile = smb_file_sendfile, | 420 | .splice_read = smb_file_splice_read, |
| 420 | }; | 421 | }; |
| 421 | 422 | ||
| 422 | const struct inode_operations smb_file_inode_operations = | 423 | const struct inode_operations smb_file_inode_operations = |
