From: Jeffrey Altman Date: Wed, 19 Dec 2012 21:58:25 +0000 (-0500) Subject: Windows: move SERVERHAS64BIT macros to cm_conn.h X-Git-Tag: upstream/1.8.0_pre1^2~1703 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9054392cdc750a17854103a87dfb12b445b8bba1;p=packages%2Fo%2Fopenafs.git Windows: move SERVERHAS64BIT macros to cm_conn.h Move the SERVERHAS64BIT and SETSERVERHASNO64BIT macros to cm_conn.h from cm_dcache.c. Change-Id: I1e1a332a3bd968645912b4e0caa0d793ef96358c Reviewed-on: http://gerrit.openafs.org/8829 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/cm_conn.h b/src/WINNT/afsd/cm_conn.h index 96bb098b9..bcd60222a 100644 --- a/src/WINNT/afsd/cm_conn.h +++ b/src/WINNT/afsd/cm_conn.h @@ -133,6 +133,13 @@ typedef struct cm_req { #endif #include "rx.h" +/* + * connp->serverp can be accessed without holding a lock because that + * never changes once the connection is created. + */ +#define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT)) +#define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE)) + extern void cm_InitConn(void); extern void cm_InitReq(cm_req_t *reqp); diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 97f5cd75f..a3ad77a59 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -34,11 +34,6 @@ extern osi_mutex_t cm_Freelance_Lock; #define USE_RX_IOVEC 1 -/* we can access connp->serverp without holding a lock because that - never changes since the connection is made. */ -#define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT)) -#define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE)) - /* functions called back from the buffer package when reading or writing data, * or when holding or releasing a vnode pointer. */