Revert "if cache_set uuid is given in format command, then put the same"

This reverts commit 38aa84d04b - previous patch
fixed this correctly.

Change-Id: I76436860a85223883efcdbb1f91c4ff874a9f3b0
This commit is contained in:
Kent Overstreet 2015-01-29 22:57:58 +00:00
parent 2ef1c983d5
commit c6fd0321f8

View File

@ -297,18 +297,7 @@ int make_bcache(NihCommand *command, char *const *args)
cache_set_sb = calloc(1, sizeof(*cache_set_sb) + cache_set_sb = calloc(1, sizeof(*cache_set_sb) +
sizeof(struct cache_member) * devs); sizeof(struct cache_member) * devs);
/*
* Currently make the cache-set uuid and user_id same,
* until proper support/usage is added.
*/
if (cache_set_uuid) {
if (uuid_parse(cache_set_uuid, cache_set_sb->set_uuid.b)) {
fprintf(stderr, "Bad uuid\n");
return -1;
}
} else {
uuid_generate(cache_set_sb->set_uuid.b); uuid_generate(cache_set_sb->set_uuid.b);
}
if (cache_set_uuid) { if (cache_set_uuid) {
if(uuid_parse(cache_set_uuid, cache_set_sb->user_uuid.b)) { if(uuid_parse(cache_set_uuid, cache_set_sb->user_uuid.b)) {