Skip to content

Commit

Permalink
Revert "Merge branch 'song1' of git://github.com/songbaisen/ceph into…
Browse files Browse the repository at this point in the history
… wip-sage-testing"

This reverts commit 7aa0ea9, reversing
changes made to f6d2eeb.
  • Loading branch information
liewegas committed Jan 12, 2016
1 parent b26c24f commit 85b5cca
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/crush/builder.c
Expand Up @@ -91,8 +91,7 @@ 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 */
assert(map->rules[r]);
/* add it */
map->rules[r] = rule;
return r;
}
Expand Down

0 comments on commit 85b5cca

Please sign in to comment.