Skip to content

Commit

Permalink
Merge branch 'song1' of git://github.com/songbaisen/ceph into wip-sag…
Browse files Browse the repository at this point in the history
…e-testing
  • Loading branch information
liewegas committed Jan 11, 2016
2 parents f6d2eeb + ba4aa41 commit 7aa0ea9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/crush/builder.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ int crush_add_rule(struct crush_map *map, struct crush_rule *rule, int ruleno)
memset(map->rules + oldsize, 0, (map->max_rules-oldsize) * sizeof(map->rules[0]));
}

/* add it */
/* add it */
assert(map->rules[r]);
map->rules[r] = rule;
return r;
}
Expand Down

0 comments on commit 7aa0ea9

Please sign in to comment.