r14173: change smb interface structures to always use

a union smb_file, to abtract
- const char *path fot qpathinfo and setpathinfo
- uint16_t fnum for SMB
- smb2_handle handle for SMB2

the idea is to later add a struct ntvfs_handle *ntvfs
so that the ntvfs subsystem don't need to know the difference between SMB and SMB2

metze
(This used to be commit 2ef3f5970901b5accdb50f0d0115b5d46b0c788f)

1 files changed, 8 insertions, 7 deletions

diff --git a/source4/ntvfs/posix/pvfs_seek.c b/source4/ntvfs/posix/pvfs_seek.c
index 33656e4004..1d43f2c855 100644
--- a/source4/ntvfs/posix/pvfs_seek.c
+++ b/source4/ntvfs/posix/pvfs_seek.c
@@ -27,14 +27,15 @@
   seek in a file
 */
 NTSTATUS pvfs_seek(struct ntvfs_module_context *ntvfs,
-		   struct ntvfs_request *req, struct smb_seek *io)
+		   struct ntvfs_request *req,
+		   union smb_seek *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
 	struct pvfs_file_handle *h;
 	NTSTATUS status;
 
-	f = pvfs_find_fd(pvfs, req, io->in.fnum);
+	f = pvfs_find_fd(pvfs, req, io->lseek.file.fnum);
 	if (!f) {
 		return NT_STATUS_INVALID_HANDLE;
 	}
@@ -42,22 +43,22 @@ NTSTATUS pvfs_seek(struct ntvfs_module_context *ntvfs,
 
 	status = NT_STATUS_OK;
 
-	switch (io->in.mode) {
+	switch (io->lseek.in.mode) {
 	case SEEK_MODE_START:
-		h->seek_offset = io->in.offset;
+		h->seek_offset = io->lseek.in.offset;
 		break;
 
 	case SEEK_MODE_CURRENT:
-		h->seek_offset += io->in.offset;
+		h->seek_offset += io->lseek.in.offset;
 		break;
 
 	case SEEK_MODE_END:
 		status = pvfs_resolve_name_fd(pvfs, h->fd, h->name);
-		h->seek_offset = h->name->st.st_size + io->in.offset;
+		h->seek_offset = h->name->st.st_size + io->lseek.in.offset;
 		break;
 	}
 
-	io->out.offset = h->seek_offset;
+	io->lseek.out.offset = h->seek_offset;
 
 	return status;
 }