From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 22 Oct 2006 03:29:58 +0000 (+0000)
Subject: DEVEL15-windows-delonclose-20061021
X-Git-Tag: openafs-devel-1_5_10~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7f2c4c5cacf0a787c2ab416a6af50e086dd3a314;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-delonclose-20061021


set delonclose after obtaining the smb_fid_t


(cherry picked from commit 77d210cde774995bffdebf3347847afebd6f7cfd)
---

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index b69b98dda..5d7a612c9 100644
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -2871,7 +2871,6 @@ long smb_ReceiveTran2QPathInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
         qpi.u.QPfileStandardInfo.allocationSize = scp->length;
         qpi.u.QPfileStandardInfo.endOfFile = scp->length;
         qpi.u.QPfileStandardInfo.numberOfLinks = scp->linkCount;
-        qpi.u.QPfileStandardInfo.deletePending = (delonclose ? 1 : 0);
         qpi.u.QPfileStandardInfo.directory = 
 	    ((scp->fileType == CM_SCACHETYPE_DIRECTORY ||
 	      scp->fileType == CM_SCACHETYPE_MOUNTPOINT ||
@@ -2886,6 +2885,7 @@ long smb_ReceiveTran2QPathInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
 	    lock_ReleaseMutex(&fidp->mx);
 	    smb_ReleaseFID(fidp);
 	}
+        qpi.u.QPfileStandardInfo.deletePending = (delonclose ? 1 : 0);
     }
     else if (infoLevel == SMB_QUERY_FILE_EA_INFO) {
         qpi.u.QPfileEaInfo.eaSize = 0;