summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-07 00:14:19 +0100
committerMichael Adam <obnox@samba.org>2008-01-07 00:14:19 +0100
commitca275e254985727c50b1b988c958a3743a7bc8ce (patch)
tree1c806c09e76402a576adaba05c9f623cb3767ba2 /source3/smbd
parent05352cf2cb7f9710444d340f3f14ac6917fb0416 (diff)
downloadsamba-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/smbd')
-rw-r--r--source3/smbd/fileio.c4
-rw-r--r--source3/smbd/vfs.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 8037510d80..a648326f89 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -77,7 +77,7 @@ ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
#ifdef DMF_FIX
int numretries = 3;
tryagain:
- readret = SMB_VFS_PREAD(fsp,fsp->fh->fd,data,n,pos);
+ readret = SMB_VFS_PREAD(fsp,data,n,pos);
if (readret == -1) {
if ((errno == EAGAIN) && numretries) {
@@ -89,7 +89,7 @@ tryagain:
return -1;
}
#else /* NO DMF fix. */
- readret = SMB_VFS_PREAD(fsp,fsp->fh->fd,data,n,pos);
+ readret = SMB_VFS_PREAD(fsp,data,n,pos);
if (readret == -1) {
return -1;
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index ed0406211d..bc272914c7 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -411,7 +411,7 @@ ssize_t vfs_pread_data(files_struct *fsp, char *buf,
while (total < byte_count)
{
- ssize_t ret = SMB_VFS_PREAD(fsp, fsp->fh->fd, buf + total,
+ ssize_t ret = SMB_VFS_PREAD(fsp, buf + total,
byte_count - total, offset + total);
if (ret == 0) return total;