|
@@ -1548,8 +1548,10 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
|
|
return;
|
|
return;
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
for (i = 0; i < len; i++) {
|
|
- if (osds[i] != CRUSH_ITEM_NONE &&
|
|
|
|
- osdmap->osd_primary_affinity[i] !=
|
|
|
|
|
|
+ int osd = osds[i];
|
|
|
|
+
|
|
|
|
+ if (osd != CRUSH_ITEM_NONE &&
|
|
|
|
+ osdmap->osd_primary_affinity[osd] !=
|
|
CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
|
|
CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -1563,10 +1565,9 @@ static void apply_primary_affinity(struct ceph_osdmap *osdmap, u32 pps,
|
|
* osd's pgs get rejected as primary.
|
|
* osd's pgs get rejected as primary.
|
|
*/
|
|
*/
|
|
for (i = 0; i < len; i++) {
|
|
for (i = 0; i < len; i++) {
|
|
- int osd;
|
|
|
|
|
|
+ int osd = osds[i];
|
|
u32 aff;
|
|
u32 aff;
|
|
|
|
|
|
- osd = osds[i];
|
|
|
|
if (osd == CRUSH_ITEM_NONE)
|
|
if (osd == CRUSH_ITEM_NONE)
|
|
continue;
|
|
continue;
|
|
|
|
|