diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-07 00:14:19 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-01-07 00:14:19 +0100 |
| commit | ca275e254985727c50b1b988c958a3743a7bc8ce (patch) | |
| tree | 1c806c09e76402a576adaba05c9f623cb3767ba2 /source3/modules/vfs_readahead.c | |
| parent | 05352cf2cb7f9710444d340f3f14ac6917fb0416 (diff) | |
| download | samba-ca275e254985727c50b1b988c958a3743a7bc8ce.tar.gz samba-ca275e254985727c50b1b988c958a3743a7bc8ce.tar.bz2 samba-ca275e254985727c50b1b988c958a3743a7bc8ce.zip | |
Remove unneeded parameter fd from SMB_VFS_PREAD().
Michael
(This used to be commit 73e28806ce87d829ea7c38ed3440020845bb13bf)
Diffstat (limited to 'source3/modules/vfs_readahead.c')
| -rw-r--r-- | source3/modules/vfs_readahead.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c index 8fdd6168fe..b3642d558f 100644 --- a/source3/modules/vfs_readahead.c +++ b/source3/modules/vfs_readahead.c @@ -80,7 +80,6 @@ static ssize_t readahead_sendfile(struct vfs_handle_struct *handle, static ssize_t readahead_pread(vfs_handle_struct *handle, files_struct *fsp, - int fd, void *data, size_t count, SMB_OFF_T offset) @@ -89,16 +88,16 @@ static ssize_t readahead_pread(vfs_handle_struct *handle, if ( offset % rhd->off_bound == 0) { #if defined(HAVE_LINUX_READAHEAD) - int err = readahead(fd, offset, (size_t)rhd->len); + int err = readahead(fsp->fh->fd, offset, (size_t)rhd->len); DEBUG(10,("readahead_pread: readahead on fd %u, offset %llu, len %u returned %d\n", - (unsigned int)fd, + (unsigned int)fsp->fh->fd, (unsigned long long)offset, (unsigned int)rhd->len, err )); #elif defined(HAVE_POSIX_FADVISE) - int err = posix_fadvise(fd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED); + int err = posix_fadvise(fsp->fh->fd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED); DEBUG(10,("readahead_pread: posix_fadvise on fd %u, offset %llu, len %u returned %d\n", - (unsigned int)fd, + (unsigned int)fsp->fh->fd, (unsigned long long)offset, (unsigned int)rhd->len, err )); @@ -109,7 +108,7 @@ static ssize_t readahead_pread(vfs_handle_struct *handle, } #endif } - return SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, count, offset); + return SMB_VFS_NEXT_PREAD(handle, fsp, data, count, offset); } /******************************************************************* |