From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 19 Dec 2012 21:59:57 +0000 (-0500)
Subject: Windows: Add SERVERHASINLINEBULK macros
X-Git-Tag: upstream/1.8.0_pre1^2~1702
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5f43eb2919e20eaa18f8252f47f1ae0eceb246f1;p=packages%2Fo%2Fopenafs.git

Windows: Add SERVERHASINLINEBULK macros

Implement SERVERHASINLINEBULK and SET_SERVERHASINLINEBULK macros.
Apply them to cm_vnodeops.c.

Change-Id: Ib9e3ed7f745a7ad3acf03ae918d8d1ca406f19c0
Reviewed-on: http://gerrit.openafs.org/8830
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/cm_conn.h b/src/WINNT/afsd/cm_conn.h
index bcd60222a..a0b10fb88 100644
--- a/src/WINNT/afsd/cm_conn.h
+++ b/src/WINNT/afsd/cm_conn.h
@@ -140,6 +140,9 @@ typedef struct cm_req {
 #define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT))
 #define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE))
 
+#define SERVERHASINLINEBULK(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NOINLINEBULK))
+#define SET_SERVERHASNOINLINEBULK(connp) (cm_SetServerNoInlineBulk((connp)->serverp, TRUE))
+
 extern void cm_InitConn(void);
 
 extern void cm_InitReq(cm_req_t *reqp);
diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 6044a788a..b813532db 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -2495,11 +2495,11 @@ cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp, cm_user_t *userp, cm_re
                 continue;
 
             rxconnp = cm_GetRxConn(connp);
-	    if (!(connp->serverp->flags & CM_SERVERFLAG_NOINLINEBULK)) {
+	    if (SERVERHASINLINEBULK(connp)) {
 		code = RXAFS_InlineBulkStatus(rxconnp, &fidStruct,
                                               &statStruct, &callbackStruct, &volSync);
 		if (code == RXGEN_OPCODE) {
-		    cm_SetServerNoInlineBulk(connp->serverp, 1);
+		    SET_SERVERHASNOINLINEBULK(connp);
 		} else {
 		    inlinebulk = 1;
 		}