}
else /* add a new server without a cell */
{
- tsp = cm_NewServer(&saddr, CM_SERVER_VLDB, NULL); /* refcount = 1 */
+ tsp = cm_NewServer(&saddr, CM_SERVER_VLDB, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
tsp->ipRank = (USHORT)dwRank;
}
}
}
else /* add a new server without a cell */
{
- tsp = cm_NewServer(&saddr, CM_SERVER_FILE, NULL); /* refcount = 1 */
+ tsp = cm_NewServer(&saddr, CM_SERVER_FILE, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
tsp->ipRank = (USHORT)dwRank;
}
}
#define CM_FLAG_NOMOUNTCHASE 0x20 /* don't follow mount points */
#define CM_FLAG_DIRSEARCH 0x40 /* for directory search */
#define CM_FLAG_CHECKPATH 0x80 /* Path instead of File */
+#define CM_FLAG_NOPROBE 0x100 /* For use with cm_GetCellxxx - do not probe server status */
/* error codes */
#define CM_ERROR_BASE 0x66543200
cm_server_t *tsp = NULL;
cm_cell_t* cellp = NULL;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
else
cm_RevokeCallback(callp, cellp, tfidp);
}
-
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
cm_PutServer(tsp);
}
}
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host),
ntohs(port));
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
code = 0;
}
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return code;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
fcnDone:
lock_ReleaseRead(&cm_scacheLock);
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return (code);
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
fcnDone:
lock_ReleaseRead(&cm_scacheLock);
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return (code);
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host), ntohs(port));
*vp = -1;
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return RXGEN_OPCODE;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
osi_Log2(afsd_logp, "SRXAFSCB_GetXStats from host 0x%x port %d - not implemented",
ntohl(host), ntohs(port));
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return RXGEN_OPCODE;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
cm_NetMtu[i] : rx_mtu;
}
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
char *p,*q;
int code = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host),
ntohs(port));
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return code;
}
/* debug interface */
-int
-SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
- char **a_name, serverList *a_hosts)
+static int
+GetCellCommon(afs_int32 a_cellnum, char **a_name, serverList *a_hosts)
{
afs_int32 sn;
cm_cell_t * cellp;
cm_serverRef_t * serverRefp;
- struct rx_connection *connp;
- struct rx_peer *peerp;
- unsigned long host = 0;
- unsigned short port = 0;
-
- MUTEX_ENTER(&callp->lock);
- if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
- host = rx_HostOf(peerp);
- port = rx_PortOf(peerp);
- }
-
- osi_Log3(afsd_logp, "SRXAFSCB_GetCellByNum(%d) from host 0x%x port %d",
- a_cellnum, ntohl(host), ntohs(port));
-
- a_hosts->serverList_val = 0;
- a_hosts->serverList_len = 0;
-
- cellp = cm_FindCellByID(a_cellnum);
+ cellp = cm_FindCellByID(a_cellnum, CM_FLAG_NOPROBE);
if (!cellp) {
*a_name = strdup("");
- MUTEX_EXIT(&callp->lock);
return 0;
}
}
lock_ReleaseRead(&cm_serverLock);
- MUTEX_EXIT(&callp->lock);
return 0;
}
/* debug interface */
int
+SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
+ char **a_name, serverList *a_hosts)
+{
+ struct rx_connection *connp;
+ struct rx_peer *peerp;
+ unsigned long host = 0;
+ unsigned short port = 0;
+ int rc;
+
+#ifdef HOLD_CALL_MUTEX
+ MUTEX_ENTER(&callp->lock);
+#endif
+ if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
+ host = rx_HostOf(peerp);
+ port = rx_PortOf(peerp);
+ }
+
+ osi_Log3(afsd_logp, "SRXAFSCB_GetCellByNum(%d) from host 0x%x port %d",
+ a_cellnum, ntohl(host), ntohs(port));
+
+ a_hosts->serverList_val = 0;
+ a_hosts->serverList_len = 0;
+
+
+ rc = GetCellCommon(a_cellnum, a_name, a_hosts);
+
+#ifdef HOLD_CALL_MUTEX
+ MUTEX_EXIT(&callp->lock);
+#endif
+ return rc;
+}
+
+/* debug interface */
+int
SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
struct interfaceAddr *addr,
Capabilities * capabilities)
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
capabilities->Capabilities_len = dataBytes / sizeof(afs_int32);
capabilities->Capabilities_val = dataBuffP;
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
*a_srvr_addr = 0xffffffff;
*a_srvr_rank = 0xffffffff;
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
int SRXAFSCB_GetCellServDB(struct rx_call *callp, afs_int32 index, char **a_name,
serverList *a_hosts)
{
- char *t_name;
struct rx_connection *connp;
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
+ int rc;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
osi_Log2(afsd_logp, "SRXAFSCB_GetCellServDB from host 0x%x port %d - not implemented",
ntohl(host), ntohs(port));
- t_name = (char *)malloc(AFSNAMEMAX);
- t_name[0] = '\0';
- *a_name = t_name;
- a_hosts->serverList_len = 0;
-
- MUTEX_EXIT(&callp->lock);
+#ifdef AFS_FREELANCE_CLIENT
+ if (cm_freelanceEnabled && index == 0) {
+ rc = GetCellCommon(AFS_FAKE_ROOT_CELL_ID, a_name, a_hosts);
+ } else
+#endif
+ {
+ rc = GetCellCommon(index+1, a_name, a_hosts);
+ }
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
}
*a_name = t_name;
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
+#ifdef HOLD_CALL_MUTEX
MUTEX_ENTER(&callp->lock);
-
+#endif
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
config->cacheConfig_val = t_config;
config->cacheConfig_len = (*configCount)/sizeof(afs_uint32);
+#ifdef HOLD_CALL_MUTEX
MUTEX_EXIT(&callp->lock);
+#endif
return 0;
}
*
* At the present time the return value is ignored by the caller.
*/
+typedef struct cm_cell_rock {
+ cm_cell_t * cellp;
+ afs_uint32 flags;
+} cm_cell_rock_t;
+
long cm_AddCellProc(void *rockp, struct sockaddr_in *addrp, char *hostnamep)
{
cm_server_t *tsp;
cm_serverRef_t *tsrp;
cm_cell_t *cellp;
+ cm_cell_rock_t *cellrockp = (cm_cell_rock_t *)rockp;
+ afs_uint32 probe;
- cellp = rockp;
+ cellp = cellrockp->cellp;
+ probe = !(cellrockp->flags & CM_FLAG_NOPROBE);
/* if this server was previously created by fs setserverprefs */
if ( tsp = cm_FindServer(addrp, CM_SERVER_VLDB))
}
}
else
- tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp);
+ tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp, probe ? 0 : CM_FLAG_NOPROBE);
/* Insert the vlserver into a sorted list, sorted by server rank */
tsrp = cm_NewServerRef(tsp, 0);
* and check to make sure we have a valid set of volume servers
* this function must be called with a Write Lock on cm_cellLock
*/
-cm_cell_t *cm_UpdateCell(cm_cell_t * cp)
+static cm_cell_t *cm_UpdateCell(cm_cell_t * cp, afs_uint32 flags)
{
long code = 0;
+ cm_cell_rock_t rock;
if (cp == NULL)
return NULL;
cp->vlServersp = NULL;
}
- code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, cp);
+ rock.cellp = cp;
+ rock.flags = flags;
+ code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, &rock);
#ifdef AFS_AFSDB_ENV
if (code) {
if (cm_dnsEnabled) {
int ttl;
- code = cm_SearchCellByDNS(cp->name, NULL, &ttl, cm_AddCellProc, cp);
+ code = cm_SearchCellByDNS(cp->name, NULL, &ttl, cm_AddCellProc, &rock);
if (code == 0) { /* got cell from DNS */
cp->flags |= CM_CELLFLAG_DNS;
cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID;
char fullname[200]="";
int hasWriteLock = 0;
afs_uint32 hash;
+ cm_cell_rock_t rock;
if (!strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH))
return NULL;
lock_ReleaseRead(&cm_cellLock);
if (cp) {
- cm_UpdateCell(cp);
+ cm_UpdateCell(cp, flags);
} else if (flags & CM_FLAG_CREATE) {
lock_ObtainWrite(&cm_cellLock);
hasWriteLock = 1;
memset(cp, 0, sizeof(cm_cell_t));
cp->magic = CM_CELL_MAGIC;
- code = cm_SearchCellFile(namep, fullname, cm_AddCellProc, cp);
+ rock.cellp = cp;
+ rock.flags = flags;
+ code = cm_SearchCellFile(namep, fullname, cm_AddCellProc, &rock);
if (code) {
osi_Log3(afsd_logp,"in cm_GetCell_gen cm_SearchCellFile(%s) returns code= %d fullname= %s",
osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname));
if (cm_dnsEnabled) {
int ttl;
- code = cm_SearchCellByDNS(namep, fullname, &ttl, cm_AddCellProc, cp);
+ code = cm_SearchCellByDNS(namep, fullname, &ttl, cm_AddCellProc, &rock);
if ( code ) {
osi_Log3(afsd_logp,"in cm_GetCell_gen cm_SearchCellByDNS(%s) returns code= %d fullname= %s",
osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname));
return cp;
}
-cm_cell_t *cm_FindCellByID(afs_int32 cellID)
+cm_cell_t *cm_FindCellByID(afs_int32 cellID, afs_uint32 flags)
{
cm_cell_t *cp;
afs_uint32 hash;
lock_ReleaseRead(&cm_cellLock);
if (cp)
- cm_UpdateCell(cp);
+ cm_UpdateCell(cp, flags);
return cp;
}
extern cm_cell_t *cm_GetCell_Gen(char *namep, char *newnamep, afs_uint32 flags);
-extern cm_cell_t *cm_FindCellByID(afs_int32 cellID);
+extern cm_cell_t *cm_FindCellByID(afs_int32 cellID, afs_uint32 flags);
extern void cm_ChangeRankCellVLServer(cm_server_t *tsp);
return CM_ERROR_INVAL;
}
- cellp = cm_FindCellByID(fidp->cell);
+ cellp = cm_FindCellByID(fidp->cell, 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
}
}
if (cellp == NULL && fidp) {
- cellp = cm_FindCellByID(fidp->cell);
+ cellp = cm_FindCellByID(fidp->cell, 0);
}
}
} else
#endif /* AFS_FREELANCE_CLIENT */
{
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, CM_FLAG_NOPROBE);
if (cellp) {
StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), cellp->name);
ioctlp->outDatap += strlen(ioctlp->outDatap) + 1;
} else
#endif
{
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
osi_assertx(cellp, "null cm_cell_t");
if (scp->flags & CM_SCACHEFLAG_RO) {
volume = scp->fid.volume;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
cm_ReleaseSCache(scp);
*/
if (haveCell) {
/* have cell name, too */
- cellp = cm_GetCell(cp, 0);
+ cellp = cm_GetCell(cp, (temp & 1) ? CM_FLAG_NOPROBE : 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
}
else cellp = (cm_cell_t *) 0;
if (!cellp && (temp & 2)) {
/* use local cell */
- cellp = cm_FindCellByID(1);
+ cellp = cm_FindCellByID(1, 0);
}
if (!(temp & 1)) { /* if not fast, call server checker routine */
/* check down servers */
}
else /* add a new server without a cell */
{
- tsp = cm_NewServer(&tmp, type, NULL); /* refcount = 1 */
+ tsp = cm_NewServer(&tmp, type, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
tsp->ipRank = rank;
}
lock_ObtainMutex(&tsp->mx);
tp += sizeof(int);
/* cell name */
- cellp = cm_GetCell(tp, CM_FLAG_CREATE);
+ cellp = cm_GetCell(tp, CM_FLAG_CREATE | CM_FLAG_NOPROBE);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
tp += strlen(tp) + 1;
{
volume = scp->fid.volume;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
cm_ReleaseSCache(scp);
}
if (testp->fid.cell > 0) {
- cellp = cm_FindCellByID(testp->fid.cell);
+ cellp = cm_FindCellByID(testp->fid.cell, 0);
}
if (!cellp)
/* otherwise, we need to find the volume */
if (!cm_freelanceEnabled || !isRoot) {
lock_ReleaseWrite(&cm_scacheLock); /* for perf. reasons */
- cellp = cm_FindCellByID(fidp->cell);
+ cellp = cm_FindCellByID(fidp->cell, 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
if (!(flags & CM_MERGEFLAG_FORCE) && dataVersion < scp->dataVersion) {
struct cm_cell *cellp;
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
if (scp->cbServerp) {
struct cm_volume *volp = NULL;
} /* and of for loop */
}
-cm_server_t *cm_NewServer(struct sockaddr_in *socketp, int type, cm_cell_t *cellp) {
+cm_server_t *cm_NewServer(struct sockaddr_in *socketp, int type, cm_cell_t *cellp, afs_uint32 flags) {
cm_server_t *tsp;
osi_assertx(socketp->sin_family == AF_INET, "unexpected socket family");
cm_allServersp = tsp;
lock_ReleaseWrite(&cm_serverLock); /* release server lock */
- cm_PingServer(tsp); /* Obtain Capabilities and check up/down state */
+ if ( !(flags & CM_FLAG_NOPROBE) )
+ cm_PingServer(tsp); /* Obtain Capabilities and check up/down state */
}
return tsp;
}
#define CM_MAXINTERFACE_ADDR 16
extern cm_server_t *cm_NewServer(struct sockaddr_in *addrp, int type,
- struct cm_cell *cellp);
+ struct cm_cell *cellp, afs_uint32 flags);
extern cm_serverRef_t *cm_NewServerRef(struct cm_server *serverp, afs_uint32 volID);
/* normal mt pt */
strcpy(volNamep, mpNamep+1);
- cellp = cm_FindCellByID(scp->fid.cell);
+ cellp = cm_FindCellByID(scp->fid.cell, 0);
}
if (!cellp) {
tsp = cm_FindServer(&tsockAddr, CM_SERVER_FILE);
if (!tsp)
tsp = cm_NewServer(&tsockAddr, CM_SERVER_FILE,
- cellp);
+ cellp, 0);
/* if this server was created by fs setserverprefs */
if ( !tsp->cellp )
if (!fidp) return;
- cellp = cm_FindCellByID(fidp->cell);
+ cellp = cm_FindCellByID(fidp->cell, 0);
if (!cellp) return;
/* search for the volume */