vfs: drop lseek stat-open checks

b9e91d2a8e41a43d7ebb7d7eed807a7d8de9b329 added fd==-1 checks to the
lseek() path to handle "stat opens". Current reply.c and
smb2_ioctl_filesys.c callers do not invoke SMB_VFS_LSEEK() with
stat-open fsp structs, so the fd==-1 checks can be removed from the
VFS.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 67b8d13989151ae514f68fa1f9a0c8a86f2e2a3f..38ffe08887e16008d15ac2220bc4af606eedda54 100644 (file)
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -575,10 +575,7 @@ static off_t cephwrap_lseek(struct vfs_handle_struct *handle, files_struct *fsp,
        off_t result = 0;
 
        DBG_DEBUG("[CEPH] cephwrap_lseek\n");
-       /* Cope with 'stat' file opens. */
-       if (fsp->fh->fd != -1) {
-               result = ceph_lseek(handle->data, fsp->fh->fd, offset, whence);
-       }
+       result = ceph_lseek(handle->data, fsp->fh->fd, offset, whence);
        WRAP_RETURN(result);
 }
 

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index cb5537e096e6cbe07c2edfe07ec37b3fa5160585..1ed2c81066738917538c919b02fb88838feb9da6 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1025,10 +1025,7 @@ static off_t vfswrap_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t o
 
        START_PROFILE(syscall_lseek);
 
-       /* Cope with 'stat' file opens. */
-       if (fsp->fh->fd != -1)
-               result = lseek(fsp->fh->fd, offset, whence);
-
+       result = lseek(fsp->fh->fd, offset, whence);
        /*
         * We want to maintain the fiction that we can seek
         * on a fifo for file system purposes. This allows