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, 2 insertions, 2 deletions

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index d2317c1852..b9b9832d51 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -243,7 +243,7 @@ static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct ntvfs_request *
 		/* check if the lock request matches exactly - you can only cancel with exact matches */
 		if (p->lck->lockx.in.ulock_cnt == lck->lockx.in.ulock_cnt &&
 		    p->lck->lockx.in.lock_cnt  == lck->lockx.in.lock_cnt &&
-		    p->lck->lockx.in.fnum      == lck->lockx.in.fnum &&
+		    p->lck->lockx.file.fnum    == lck->lockx.file.fnum &&
 		    p->lck->lockx.in.mode      == (lck->lockx.in.mode & ~LOCKING_ANDX_CANCEL_LOCK)) {
 			int i;
 
@@ -285,7 +285,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
 		return ntvfs_map_lock(ntvfs, req, lck);
 	}
 
-	f = pvfs_find_fd(pvfs, req, lck->lockx.in.fnum);
+	f = pvfs_find_fd(pvfs, req, lck->lockx.file.fnum);
 	if (!f) {
 		return NT_STATUS_INVALID_HANDLE;
 	}