summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2015-01-29 22:57:58 +0000
committerKent Overstreet <kmo@daterainc.com>2015-01-29 22:58:21 +0000
commitc6fd0321f8e9bc11ca448befc8815308562f0f90 (patch)
tree8c0b606a1bae01ae1e6ef2ffa6b83c6f10723920
parent2ef1c983d56438d4f53b1534545e6d0f54063ab8 (diff)
Revert "if cache_set uuid is given in format command, then put the same"
This reverts commit 38aa84d04bcd47bb832c3b7ec1e40be9d3c38c69 - previous patch fixed this correctly. Change-Id: I76436860a85223883efcdbb1f91c4ff874a9f3b0
-rw-r--r--bcacheadm.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/bcacheadm.c b/bcacheadm.c
index c139494..c62728a 100644
--- a/bcacheadm.c
+++ b/bcacheadm.c
@@ -297,18 +297,7 @@ int make_bcache(NihCommand *command, char *const *args)
cache_set_sb = calloc(1, sizeof(*cache_set_sb) +
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(uuid_parse(cache_set_uuid, cache_set_sb->user_uuid.b)) {