From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 18 Jul 2007 13:09:06 +0000 (+0000)
Subject: DEVEL15-windows-single-dir-search-not-bulk-20070718
X-Git-Tag: openafs-devel-1_5_22~39
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=65f8e4e53ad80580ee5069cf0df293f9ff998f8b;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-single-dir-search-not-bulk-20070718


the single directory search routine used when there are no wildcards
does not perform a bulk stat operation.  do not set the flag on the
cm_scache_t.


(cherry picked from commit a8b270d5a3db7a873de5cb945ccfc5c6425798f9)
---

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 059246aad..2680215b6 100644
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4337,7 +4337,7 @@ long smb_T2SearchDirSingle(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *op
         
     userp = smb_GetTran2User(vcp, p);
     if (!userp) {
-    	osi_Log1(smb_logp, "T2 search dir unable to resolve user [%d]", p->uid);
+    	osi_Log1(smb_logp, "T2SDSingle search dir unable to resolve user [%d]", p->uid);
     	smb_FreeTran2Packet(outp);
     	return CM_ERROR_BADSMB;
     }
@@ -4378,13 +4378,7 @@ long smb_T2SearchDirSingle(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *op
 	return 0;
     }
 #endif /* DFS_SUPPORT */
-    osi_Log1(smb_logp,"smb_ReceiveTran2SearchDir scp 0x%p", scp);
-    lock_ObtainMutex(&scp->mx);
-    if ((scp->flags & CM_SCACHEFLAG_BULKSTATTING) == 0 &&
-	 LargeIntegerGreaterOrEqualToZero(scp->bulkStatProgress)) {
-	scp->flags |= CM_SCACHEFLAG_BULKSTATTING;
-    }
-    lock_ReleaseMutex(&scp->mx);
+    osi_Log1(smb_logp,"T2SDSingle scp 0x%p", scp);
 
     /* now do a single case sensitive lookup for the file in question */
     code = cm_Lookup(scp, maskp, CM_FLAG_NOMOUNTCHASE, userp, &req, &targetscp);