summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-15 12:22:36 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-15 12:22:36 +0100
commit1f65ddb33678e44fe6f6d10af42842f11bd10cc5 (patch)
treeafa4a086345b15e1243a0c4f4110fb7f16241b70
parentcaea7508102c2ebbe03e9de5d761ac96490c9a06 (diff)
downloadsamba-1f65ddb33678e44fe6f6d10af42842f11bd10cc5.tar.gz
samba-1f65ddb33678e44fe6f6d10af42842f11bd10cc5.tar.bz2
samba-1f65ddb33678e44fe6f6d10af42842f11bd10cc5.zip
pvfs_unlink: disable async retries for wildcard deletes
We would setup multiple retries per client request. metze (This used to be commit 951764e28407a53ea4dd39d34388fab1b2259785)
-rw-r--r--source4/ntvfs/posix/pvfs_unlink.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index 7a2d964b9d..4cb47a4f1f 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -219,6 +219,12 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
return pvfs_unlink_one(pvfs, req, unl, name);
}
+ /*
+ * disable async requests in the wildcard case
+ * untill we have proper tests for this
+ */
+ req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
/* get list of matching files */
status = pvfs_list_start(pvfs, name, req, &dir);
if (!NT_STATUS_IS_OK(status)) {