The branch, v3-2-test has been updated
       via  c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1 (commit)
       via  a8fc2ddad8d5f7c6c00cb36c74a32a02d69d1d04 (commit)
      from  395f29d8b768a56af20b37f185eccdc5f37b68d5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit c8ae7d095a2a6a7eac920a68ca7244e3a423e1b1
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:49:35 2008 +0100

    Remove redundant parameter fd from SMB_VFS_WRITE().
    
    Michael

commit a8fc2ddad8d5f7c6c00cb36c74a32a02d69d1d04
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 15:33:51 2008 +0100

    Remove redundant parameter fd from SMB_VFS_READ().
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 examples/VFS/skel_opaque.c      |    8 ++++----
 examples/VFS/skel_transparent.c |    8 ++++----
 source/include/vfs.h            |    6 ++++--
 source/include/vfs_macros.h     |   12 ++++++------
 source/modules/vfs_cacheprime.c |    2 +-
 source/modules/vfs_commit.c     |    3 +--
 source/modules/vfs_default.c    |   22 +++++++++++-----------
 source/modules/vfs_full_audit.c |   12 ++++++------
 source/smbd/vfs.c               |   10 +++++-----
 source/torture/cmd_vfs.c        |    4 ++--
 10 files changed, 44 insertions(+), 43 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 8c05479..6b1f29b 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -130,9 +130,9 @@ static int skel_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
        return vfswrap_close(NULL, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, 
void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n)
 {
-       return vfswrap_read(NULL, fsp, fd, data, n);
+       return vfswrap_read(NULL, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, 
void *data, size_t n, SMB_OFF_T offset)
@@ -140,9 +140,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, struct 
files_struct *fsp, v
        return vfswrap_pread(NULL, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n)
 {
-       return vfswrap_write(NULL, fsp, fd, data, n);
+       return vfswrap_write(NULL, fsp, data, n);
 }
 
 ssize_t skel_pwrite(vfs_handle_struct *handle, struct files_struct *fsp, const 
void *data, size_t n, SMB_OFF_T offset)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index f15cdfd..c168b46 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -124,9 +124,9 @@ static int skel_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
        return SMB_VFS_NEXT_CLOSE(handle, fsp, fd);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, int fd, 
void *data, size_t n)
+static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n)
 {
-       return SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+       return SMB_VFS_NEXT_READ(handle, fsp, data, n);
 }
 
 static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n, SMB_OFF_T offset)
@@ -134,9 +134,9 @@ static ssize_t skel_pread(vfs_handle_struct *handle, 
files_struct *fsp, void *da
        return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n)
 {
-       return SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+       return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 }
 
 static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const 
void *data, size_t n, SMB_OFF_T offset)
diff --git a/source/include/vfs.h b/source/include/vfs.h
index 02cfb12..8aa8057 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -99,6 +99,8 @@
 /* Leave at 22 - not yet released. Remove parameter fd from fremovexattr. - 
obnox */
 /* Leave at 22 - not yet released. Remove parameter fd from fsetxattr. - obnox 
*/
 /* Leave at 22 - not yet released. Remove parameter fd from aio_cancel. - 
obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from read. - obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from write. - obnox */
 
 
 
@@ -290,9 +292,9 @@ struct vfs_ops {
                
                int (*open)(struct vfs_handle_struct *handle, const char 
*fname, files_struct *fsp, int flags, mode_t mode);
                int (*close_fn)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, int fd);
-               ssize_t (*read)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, int fd, void *data, size_t n);
+               ssize_t (*read)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, void *data, size_t n);
                ssize_t (*pread)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, void *data, size_t n, SMB_OFF_T offset);
-               ssize_t (*write)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, int fd, const void *data, size_t n);
+               ssize_t (*write)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, const void *data, size_t n);
                ssize_t (*pwrite)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset);
                SMB_OFF_T (*lseek)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, SMB_OFF_T offset, int whence);
                ssize_t (*sendfile)(struct vfs_handle_struct *handle, int tofd, 
files_struct *fsp, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, 
size_t count);
diff --git a/source/include/vfs_macros.h b/source/include/vfs_macros.h
index 63e566b..48f5fcf 100644
--- a/source/include/vfs_macros.h
+++ b/source/include/vfs_macros.h
@@ -48,9 +48,9 @@
 /* File operations */
 #define SMB_VFS_OPEN(conn, fname, fsp, flags, mode) 
(((conn)->vfs.ops.open)((conn)->vfs.handles.open, (fname), (fsp), (flags), 
(mode)))
 #define SMB_VFS_CLOSE(fsp, fd) 
((fsp)->conn->vfs.ops.close_fn((fsp)->conn->vfs.handles.close_hnd, (fsp), (fd)))
-#define SMB_VFS_READ(fsp, fd, data, n) 
((fsp)->conn->vfs.ops.read((fsp)->conn->vfs.handles.read, (fsp), (fd), (data), 
(n)))
+#define SMB_VFS_READ(fsp, data, n) 
((fsp)->conn->vfs.ops.read((fsp)->conn->vfs.handles.read, (fsp), (data), (n)))
 #define SMB_VFS_PREAD(fsp, data, n, off) 
((fsp)->conn->vfs.ops.pread((fsp)->conn->vfs.handles.pread, (fsp), (data), (n), 
(off)))
-#define SMB_VFS_WRITE(fsp, fd, data, n) 
((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (fd), 
(data), (n)))
+#define SMB_VFS_WRITE(fsp, data, n) 
((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (data), (n)))
 #define SMB_VFS_PWRITE(fsp, data, n, off) 
((fsp)->conn->vfs.ops.pwrite((fsp)->conn->vfs.handles.pwrite, (fsp), (data), 
(n), (off)))
 #define SMB_VFS_LSEEK(fsp, offset, whence) 
((fsp)->conn->vfs.ops.lseek((fsp)->conn->vfs.handles.lseek, (fsp), (offset), 
(whence)))
 #define SMB_VFS_SENDFILE(tofd, fsp, fromfd, header, offset, count) 
((fsp)->conn->vfs.ops.sendfile((fsp)->conn->vfs.handles.sendfile, (tofd), 
(fsp), (fromfd), (header), (offset), (count)))
@@ -167,9 +167,9 @@
 /* File operations */
 #define SMB_VFS_OPAQUE_OPEN(conn, fname, fsp, flags, mode) 
(((conn)->vfs_opaque.ops.open)((conn)->vfs_opaque.handles.open, (fname), (fsp), 
(flags), (mode)))
 #define SMB_VFS_OPAQUE_CLOSE(fsp, fd) 
((fsp)->conn->vfs_opaque.ops.close_fn((fsp)->conn->vfs_opaque.handles.close_hnd,
 (fsp), (fd)))
-#define SMB_VFS_OPAQUE_READ(fsp, fd, data, n) 
((fsp)->conn->vfs_opaque.ops.read((fsp)->conn->vfs_opaque.handles.read, (fsp), 
(fd), (data), (n)))
+#define SMB_VFS_OPAQUE_READ(fsp, data, n) 
((fsp)->conn->vfs_opaque.ops.read((fsp)->conn->vfs_opaque.handles.read, (fsp), 
(data), (n)))
 #define SMB_VFS_OPAQUE_PREAD(fsp, data, n, off) 
((fsp)->conn->vfs_opaque.ops.pread((fsp)->conn->vfs_opaque.handles.pread, 
(fsp), (data), (n), (off)))
-#define SMB_VFS_OPAQUE_WRITE(fsp, fd, data, n) 
((fsp)->conn->vfs_opaque.ops.write((fsp)->conn->vfs_opaque.handles.write, 
(fsp), (fd), (data), (n)))
+#define SMB_VFS_OPAQUE_WRITE(fsp, data, n) 
((fsp)->conn->vfs_opaque.ops.write((fsp)->conn->vfs_opaque.handles.write, 
(fsp), (data), (n)))
 #define SMB_VFS_OPAQUE_PWRITE(fsp, data, n, off) 
((fsp)->conn->vfs_opaque.ops.pwrite((fsp)->conn->vfs_opaque.handles.pwrite, 
(fsp), (data), (n), (off)))
 #define SMB_VFS_OPAQUE_LSEEK(fsp, offset, whence) 
((fsp)->conn->vfs_opaque.ops.lseek((fsp)->conn->vfs_opaque.handles.lseek, 
(fsp), (offset), (whence)))
 #define SMB_VFS_OPAQUE_SENDFILE(tofd, fsp, fromfd, header, offset, count) 
((fsp)->conn->vfs_opaque.ops.sendfile((fsp)->conn->vfs_opaque.handles.sendfile, 
(tofd), (fsp), (fromfd), (header), (offset), (count)))
@@ -287,9 +287,9 @@
 /* File operations */
 #define SMB_VFS_NEXT_OPEN(handle, fname, fsp, flags, mode) 
(((handle)->vfs_next.ops.open)((handle)->vfs_next.handles.open, (fname), (fsp), 
(flags), (mode)))
 #define SMB_VFS_NEXT_CLOSE(handle, fsp, fd) 
((handle)->vfs_next.ops.close_fn((handle)->vfs_next.handles.close_hnd, (fsp), 
(fd)))
-#define SMB_VFS_NEXT_READ(handle, fsp, fd, data, n) 
((handle)->vfs_next.ops.read((handle)->vfs_next.handles.read, (fsp), (fd), 
(data), (n)))
+#define SMB_VFS_NEXT_READ(handle, fsp, data, n) 
((handle)->vfs_next.ops.read((handle)->vfs_next.handles.read, (fsp), (data), 
(n)))
 #define SMB_VFS_NEXT_PREAD(handle, fsp, data, n, off) 
((handle)->vfs_next.ops.pread((handle)->vfs_next.handles.pread, (fsp), (data), 
(n), (off)))
-#define SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n) 
((handle)->vfs_next.ops.write((handle)->vfs_next.handles.write, (fsp), (fd), 
(data), (n)))
+#define SMB_VFS_NEXT_WRITE(handle, fsp, data, n) 
((handle)->vfs_next.ops.write((handle)->vfs_next.handles.write, (fsp), (data), 
(n)))
 #define SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, off) 
((handle)->vfs_next.ops.pwrite((handle)->vfs_next.handles.pwrite, (fsp), 
(data), (n), (off)))
 #define SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence) 
((handle)->vfs_next.ops.lseek((handle)->vfs_next.handles.lseek, (fsp), 
(offset), (whence)))
 #define SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, fromfd, header, offset, 
count) ((handle)->vfs_next.ops.sendfile((handle)->vfs_next.handles.sendfile, 
(tofd), (fsp), (fromfd), (header), (offset), (count)))
diff --git a/source/modules/vfs_cacheprime.c b/source/modules/vfs_cacheprime.c
index 6eb74e6..4ac7843 100644
--- a/source/modules/vfs_cacheprime.c
+++ b/source/modules/vfs_cacheprime.c
@@ -154,7 +154,7 @@ static ssize_t cprime_read(
                 SMB_VFS_LSEEK(fsp, fd, offset, SEEK_SET);
         }
 
-        return SMB_VFS_NEXT_READ(handle, fsp, fd, data, count);
+        return SMB_VFS_NEXT_READ(handle, fsp, data, count);
 }
 
 static ssize_t cprime_pread(
diff --git a/source/modules/vfs_commit.c b/source/modules/vfs_commit.c
index fe73241..ac391cf 100644
--- a/source/modules/vfs_commit.c
+++ b/source/modules/vfs_commit.c
@@ -229,12 +229,11 @@ static int commit_open(
 static ssize_t commit_write(
         vfs_handle_struct * handle,
         files_struct *      fsp,
-        int                 fd,
         void *              data,
         size_t              count)
 {
         ssize_t ret;
-        ret = SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, count);
+        ret = SMB_VFS_NEXT_WRITE(handle, fsp, data, count);
 
         if (ret > 0) {
                 if (commit(handle, fsp, fsp->fh->pos, ret) == -1) {
diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c
index 97138bd..e57d24c 100644
--- a/source/modules/vfs_default.c
+++ b/source/modules/vfs_default.c
@@ -208,12 +208,12 @@ static int vfswrap_close(vfs_handle_struct *handle, 
files_struct *fsp, int fd)
        return result;
 }
 
-static ssize_t vfswrap_read(vfs_handle_struct *handle, files_struct *fsp, int 
fd, void *data, size_t n)
+static ssize_t vfswrap_read(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n)
 {
        ssize_t result;
 
        START_PROFILE_BYTES(syscall_read, n);
-       result = sys_read(fd, data, n);
+       result = sys_read(fsp->fh->fd, data, n);
        END_PROFILE(syscall_read);
        return result;
 }
@@ -230,7 +230,7 @@ static ssize_t vfswrap_pread(vfs_handle_struct *handle, 
files_struct *fsp, void
 
        if (result == -1 && errno == ESPIPE) {
                /* Maintain the fiction that pipes can be seeked (sought?) on. 
*/
-               result = SMB_VFS_READ(fsp, fsp->fh->fd, data, n);
+               result = SMB_VFS_READ(fsp, data, n);
                fsp->fh->pos = 0;
        }
 
@@ -241,7 +241,7 @@ static ssize_t vfswrap_pread(vfs_handle_struct *handle, 
files_struct *fsp, void
        curr = SMB_VFS_LSEEK(fsp, 0, SEEK_CUR);
        if (curr == -1 && errno == ESPIPE) {
                /* Maintain the fiction that pipes can be seeked (sought?) on. 
*/
-               result = SMB_VFS_READ(fsp, fsp->fh->fd, data, n);
+               result = SMB_VFS_READ(fsp, data, n);
                fsp->fh->pos = 0;
                return result;
        }
@@ -251,7 +251,7 @@ static ssize_t vfswrap_pread(vfs_handle_struct *handle, 
files_struct *fsp, void
        }
 
        errno = 0;
-       result = SMB_VFS_READ(fsp, fsp->fh->fd, data, n);
+       result = SMB_VFS_READ(fsp, data, n);
        lerrno = errno;
 
        SMB_VFS_LSEEK(fsp, curr, SEEK_SET);
@@ -262,12 +262,12 @@ static ssize_t vfswrap_pread(vfs_handle_struct *handle, 
files_struct *fsp, void
        return result;
 }
 
-static ssize_t vfswrap_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
+static ssize_t vfswrap_write(vfs_handle_struct *handle, files_struct *fsp, 
const void *data, size_t n)
 {
        ssize_t result;
 
        START_PROFILE_BYTES(syscall_write, n);
-       result = sys_write(fd, data, n);
+       result = sys_write(fsp->fh->fd, data, n);
        END_PROFILE(syscall_write);
        return result;
 }
@@ -284,7 +284,7 @@ static ssize_t vfswrap_pwrite(vfs_handle_struct *handle, 
files_struct *fsp, cons
 
        if (result == -1 && errno == ESPIPE) {
                /* Maintain the fiction that pipes can be sought on. */
-               result = SMB_VFS_WRITE(fsp, fsp->fh->fd, data, n);
+               result = SMB_VFS_WRITE(fsp, data, n);
        }
 
 #else /* HAVE_PWRITE */
@@ -300,7 +300,7 @@ static ssize_t vfswrap_pwrite(vfs_handle_struct *handle, 
files_struct *fsp, cons
                return -1;
        }
 
-       result = SMB_VFS_WRITE(fsp, fsp->fh->fd, data, n);
+       result = SMB_VFS_WRITE(fsp, data, n);
        lerrno = errno;
 
        SMB_VFS_LSEEK(fsp, curr, SEEK_SET);
@@ -712,7 +712,7 @@ static int strict_allocate_ftruncate(vfs_handle_struct 
*handle, files_struct *fs
                SMB_OFF_T retlen;
                SMB_OFF_T current_len_to_write = 
MIN(sizeof(zero_space),space_to_write);
 
-               retlen = SMB_VFS_WRITE(fsp,fsp->fh->fd,(char 
*)zero_space,current_len_to_write);
+               retlen = SMB_VFS_WRITE(fsp,(char 
*)zero_space,current_len_to_write);
                if (retlen <= 0)
                        return -1;
 
@@ -787,7 +787,7 @@ static int vfswrap_ftruncate(vfs_handle_struct *handle, 
files_struct *fsp, SMB_O
        if (SMB_VFS_LSEEK(fsp, len-1, SEEK_SET) != len -1)
                goto done;
 
-       if (SMB_VFS_WRITE(fsp, fsp->fh->fd, &c, 1)!=1)
+       if (SMB_VFS_WRITE(fsp, &c, 1)!=1)
                goto done;
 
        /* Seek to where we were */
diff --git a/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index 95fdc17..0051267 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/modules/vfs_full_audit.c
@@ -113,11 +113,11 @@ static int smb_full_audit_open(vfs_handle_struct *handle,
                      const char *fname, files_struct *fsp, int flags, mode_t 
mode);
 static int smb_full_audit_close(vfs_handle_struct *handle, files_struct *fsp, 
int fd);
 static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct 
*fsp,
-                         int fd, void *data, size_t n);
+                         void *data, size_t n);
 static ssize_t smb_full_audit_pread(vfs_handle_struct *handle, files_struct 
*fsp,
                           void *data, size_t n, SMB_OFF_T offset);
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct 
*fsp,
-                          int fd, const void *data, size_t n);
+                          const void *data, size_t n);
 static ssize_t smb_full_audit_pwrite(vfs_handle_struct *handle, files_struct 
*fsp,
                            const void *data, size_t n,
                            SMB_OFF_T offset);
@@ -1087,11 +1087,11 @@ static int smb_full_audit_close(vfs_handle_struct 
*handle, files_struct *fsp, in
 }
 
 static ssize_t smb_full_audit_read(vfs_handle_struct *handle, files_struct 
*fsp,
-                         int fd, void *data, size_t n)
+                         void *data, size_t n)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
+       result = SMB_VFS_NEXT_READ(handle, fsp, data, n);
 
        do_log(SMB_VFS_OP_READ, (result >= 0), handle, "%s", fsp->fsp_name);
 
@@ -1111,11 +1111,11 @@ static ssize_t smb_full_audit_pread(vfs_handle_struct 
*handle, files_struct *fsp
 }
 
 static ssize_t smb_full_audit_write(vfs_handle_struct *handle, files_struct 
*fsp,
-                          int fd, const void *data, size_t n)
+                          const void *data, size_t n)
 {
        ssize_t result;
 
-       result = SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n);
+       result = SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 
        do_log(SMB_VFS_OP_WRITE, (result >= 0), handle, "%s", fsp->fsp_name);
 
diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c
index a57dcdd..1e71da7 100644
--- a/source/smbd/vfs.c
+++ b/source/smbd/vfs.c
@@ -389,8 +389,8 @@ ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t 
byte_count)
 
        while (total < byte_count)
        {
-               ssize_t ret = SMB_VFS_READ(fsp, fsp->fh->fd, buf + total,
-                                       byte_count - total);
+               ssize_t ret = SMB_VFS_READ(fsp, buf + total,
+                                          byte_count - total);
 
                if (ret == 0) return total;
                if (ret == -1) {
@@ -451,7 +451,7 @@ ssize_t vfs_write_data(struct smb_request *req,
        }
 
        while (total < N) {
-               ret = SMB_VFS_WRITE(fsp,fsp->fh->fd,buffer + total,N - total);
+               ret = SMB_VFS_WRITE(fsp, buffer + total, N - total);
 
                if (ret == -1)
                        return -1;
@@ -666,14 +666,14 @@ static ssize_t vfs_read_fn(void *file, void *buf, size_t 
len)
 {
        struct files_struct *fsp = (struct files_struct *)file;
 
-       return SMB_VFS_READ(fsp, fsp->fh->fd, buf, len);
+       return SMB_VFS_READ(fsp, buf, len);
 }
 
 static ssize_t vfs_write_fn(void *file, const void *buf, size_t len)
 {
        struct files_struct *fsp = (struct files_struct *)file;
 
-       return SMB_VFS_WRITE(fsp, fsp->fh->fd, buf, len);
+       return SMB_VFS_WRITE(fsp, buf, len);
 }
 
 SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n)
diff --git a/source/torture/cmd_vfs.c b/source/torture/cmd_vfs.c
index e349df6..f3b9886 100644
--- a/source/torture/cmd_vfs.c
+++ b/source/torture/cmd_vfs.c
@@ -389,7 +389,7 @@ static NTSTATUS cmd_read(struct vfs_state *vfs, TALLOC_CTX 
*mem_ctx, int argc, c
        }
        vfs->data_size = size;
        
-       rsize = SMB_VFS_READ(vfs->files[fd], fd, vfs->data, size);
+       rsize = SMB_VFS_READ(vfs->files[fd], vfs->data, size);
        if (rsize == -1) {
                printf("read: error=%d (%s)\n", errno, strerror(errno));
                return NT_STATUS_UNSUCCESSFUL;
@@ -422,7 +422,7 @@ static NTSTATUS cmd_write(struct vfs_state *vfs, TALLOC_CTX 
*mem_ctx, int argc,
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       wsize = SMB_VFS_WRITE(vfs->files[fd], fd, vfs->data, size);
+       wsize = SMB_VFS_WRITE(vfs->files[fd], vfs->data, size);
 
        if (wsize == -1) {
                printf("write: error=%d (%s)\n", errno, strerror(errno));


-- 
Samba Shared Repository

Reply via email to