summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-07-11 18:15:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:02 -0500
commit3b36a857980b1f9fa5a6be0253e85c975f35c13f (patch)
tree3eadbd0a44cb67b6773e0bee0e81af688c097854 /source4/ntvfs/posix
parentd89b4adf7abdc74f23960dee3f4961006ac12be6 (diff)
downloadsamba-3b36a857980b1f9fa5a6be0253e85c975f35c13f.tar.gz
samba-3b36a857980b1f9fa5a6be0253e85c975f35c13f.tar.bz2
samba-3b36a857980b1f9fa5a6be0253e85c975f35c13f.zip
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)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_wait.c3
1 files changed, 1 insertions, 2 deletions
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);