r16950: remove the smb mid from the ntvfs layer and keep a list of pending

requests on the smbsrv_connection, to be able to match then on
ntcancel

metze
(This used to be commit 04f0d3d03179b6060fd013b867d13caa92ec6460)

4 files changed, 3 insertions, 8 deletions

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 47b89ff662..41ea2a652d 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -803,7 +803,7 @@ static NTSTATUS cvfs_cancel(struct ntvfs_module_context *ntvfs,
 
 	/* find the matching request */
 	for (a=private->pending;a;a=a->next) {
-		if (a->req->smbmid == req->smbmid) {
+		if (a->req == req) {
 			break;
 		}
 	}
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index cf541de81e..734df84dde 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -253,9 +253,6 @@ struct ntvfs_request {
 	/* the smb pid is needed for locking contexts */
 	uint16_t smbpid;
 
-	/* the smb mid is needed for matching requests */
-	uint16_t smbmid;
-
 	/* some statictics for the management tools */
 	struct {
 		/* the system time when the request arrived */
diff --git a/source4/ntvfs/ntvfs_util.c b/source4/ntvfs/ntvfs_util.c
index d99d040378..5c73b53c1c 100644
--- a/source4/ntvfs/ntvfs_util.c
+++ b/source4/ntvfs/ntvfs_util.c
@@ -28,7 +28,7 @@
 
 _PUBLIC_ struct ntvfs_request *ntvfs_request_create(struct ntvfs_context *ctx, TALLOC_CTX *mem_ctx,
 						    struct auth_session_info *session_info,
-						    uint16_t smbpid, uint16_t smbmid,
+						    uint16_t smbpid,
 						    struct timeval request_time,
 						    void *private_data,
 						    void (*send_fn)(struct ntvfs_request *),
@@ -43,7 +43,6 @@ _PUBLIC_ struct ntvfs_request *ntvfs_request_create(struct ntvfs_context *ctx, T
 	req->async_states		= NULL;
 	req->session_info		= session_info;
 	req->smbpid			= smbpid;
-	req->smbmid			= smbmid;
 	req->statistics.request_time	= request_time;
 
 	async = talloc(req, struct ntvfs_async_state);
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index 90c9b60efe..d912125289 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -179,8 +179,7 @@ NTSTATUS pvfs_cancel(struct ntvfs_module_context *ntvfs, struct ntvfs_request *r
 	struct pvfs_wait *pwait;
 
 	for (pwait=pvfs->wait_list;pwait;pwait=pwait->next) {
-		if (req->smbmid == pwait->req->smbmid &&
-		    req->smbpid == pwait->req->smbpid) {
+		if (pwait->req == req) {
 			/* trigger a cancel on the request */
 			pwait->reason = PVFS_WAIT_CANCEL;
 			ntvfs_async_setup(pwait->req, pwait);