Commit 2b392528 authored by ml's avatar ml

*** empty log message ***

parent 8d659b96
...@@ -1034,7 +1034,6 @@ volumes ( ...@@ -1034,7 +1034,6 @@ volumes (
gdb_sNode *np; gdb_sNode *np;
pwr_tUInt32 nid = get->sender.nid; pwr_tUInt32 nid = get->sender.nid;
gdb_ScopeLock { gdb_ScopeLock {
np = hash_Search(&sts, gdbroot->nid_ht, &nid); np = hash_Search(&sts, gdbroot->nid_ht, &nid);
...@@ -1063,11 +1062,9 @@ volumes ( ...@@ -1063,11 +1062,9 @@ volumes (
if (vp->l.flags.b.isMounted) { if (vp->l.flags.b.isMounted) {
errh_Info("!!cvolcm_ConnectVolume %s", &vmp->g[i].name);
cvolcm_ConnectVolume(&sts, vp, &vmp->g[i], np); cvolcm_ConnectVolume(&sts, vp, &vmp->g[i], np);
nConnect++; nConnect++;
} else { } else {
errh_Info("!!Volume %s is not mounted", &vmp->g[i].name);
vmp->g[i].vid = pwr_cNVolumeId; vmp->g[i].vid = pwr_cNVolumeId;
} }
} }
...@@ -1100,8 +1097,11 @@ volumes7 ( ...@@ -1100,8 +1097,11 @@ volumes7 (
int size; int size;
pwr_tBoolean ok = 1; pwr_tBoolean ok = 1;
size = sizeof(*vmp) + ((v7mp->count - 1) * sizeof(vmp->g[0])); size = sizeof(*vmp) + ((v7mp->count - 1) * sizeof(vmp->g[0]));
vmp = (net_sVolumes *) malloc(size); vmp = (net_sVolumes *) malloc(size);
vmp->count = 0;
if (vmp == NULL) { if (vmp == NULL) {
errh_Error("Failed to allocate 'volumes7' from nid %d, count %d", errh_Error("Failed to allocate 'volumes7' from nid %d, count %d",
get->sender.nid, v7mp->count); get->sender.nid, v7mp->count);
...@@ -1120,7 +1120,8 @@ volumes7 ( ...@@ -1120,7 +1120,8 @@ volumes7 (
} else { } else {
memcpy(&vmp->g[i], &v7mp->g[i], sizeof(v7mp->g[0])); memcpy(&vmp->g[i], &v7mp->g[i], sizeof(v7mp->g[0]));
/* The time is only used for class volumes */ /* The time is only used for class volumes */
memset(&vmp->g[i].time, 0, sizeof(vmp->g[0].time)); memset(&vmp->g[i].time, 0, sizeof(vmp->g[0].time));
vmp->count++;
} }
} }
......
...@@ -256,9 +256,7 @@ lockMountServers ( ...@@ -256,9 +256,7 @@ lockMountServers (
msl != &vp->l.volms_lh; msl != &vp->l.volms_lh;
msl = pool_Qsucc(NULL, gdbroot->pool, msl) msl = pool_Qsucc(NULL, gdbroot->pool, msl)
) { ) {
msp = pool_Qitem(msl, gdb_sMountServer, volms_ll); msp = pool_Qitem(msl, gdb_sMountServer, volms_ll);
errh_Info("!!!!! Found mountserver !!!!!");
op = hash_Search(&sts, gdbroot->oid_ht, &msp->oid); op = hash_Search(&sts, gdbroot->oid_ht, &msp->oid);
if (op == NULL) { if (op == NULL) {
op = cvolc_OidToObject(&sts, vp, msp->oid, vol_mTrans_none, cvol_eHint_none); op = cvolc_OidToObject(&sts, vp, msp->oid, vol_mTrans_none, cvol_eHint_none);
...@@ -272,7 +270,7 @@ lockMountServers ( ...@@ -272,7 +270,7 @@ lockMountServers (
op->l.flags.b.isMountServer = 1; op->l.flags.b.isMountServer = 1;
pool_QinsertPred(NULL, gdbroot->pool, &msp->nodms_ll, &np->nodms_lh); pool_QinsertPred(NULL, gdbroot->pool, &msp->nodms_ll, &np->nodms_lh);
if (1) errh_Info("Locking object %s", op->g.f.name.orig); if (0) errh_Info("Locking object %s", op->g.f.name.orig);
cvolc_LockObject(&sts, op); cvolc_LockObject(&sts, op);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment