diff options
author | Josh Durgin <josh.durgin@inktank.com> | 2012-07-12 11:13:47 -0700 |
---|---|---|
committer | Josh Durgin <josh.durgin@inktank.com> | 2012-07-12 11:27:32 -0700 |
commit | 508bf3fb96929dc6e91ee83a915a7f30df23eeeb (patch) | |
tree | da1b7ff6496e538e01d679b49d89bd279fee99f9 | |
parent | dfe29aff7f465d9e854fac88809f4d3421241725 (diff) | |
download | ceph-508bf3fb96929dc6e91ee83a915a7f30df23eeeb.tar.gz |
rbd: enable layering when using the new format
We'll add options for different features later.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r-- | src/rbd.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rbd.cc b/src/rbd.cc index df3fc9065c7..020071db3ae 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -1015,6 +1015,7 @@ int main(int argc, const char **argv) uint64_t size = 0; // in bytes int order = 0; bool old_format = true; + uint64_t features = RBD_FEATURE_LAYERING; const char *imgname = NULL, *snapname = NULL, *destname = NULL, *dest_poolname = NULL, *dest_snapname = NULL, *path = NULL, *secretfile = NULL, *user = NULL, *devpath = NULL; std::string val; @@ -1279,7 +1280,7 @@ int main(int argc, const char **argv) usage(); exit(1); } - r = do_create(rbd, io_ctx, imgname, size, &order, old_format, 0); + r = do_create(rbd, io_ctx, imgname, size, &order, old_format, features); if (r < 0) { cerr << "create error: " << cpp_strerror(-r) << std::endl; exit(1); @@ -1294,7 +1295,7 @@ int main(int argc, const char **argv) } r = do_clone(rbd, io_ctx, imgname, snapname, dest_io_ctx, destname, - RBD_FEATURE_LAYERING, &order); + features, &order); if (r < 0) { cerr << "clone error: " << cpp_strerror(-r) << std::endl; exit(1); @@ -1424,7 +1425,7 @@ int main(int argc, const char **argv) exit(1); } r = do_import(rbd, dest_io_ctx, destname, &order, path, - old_format, 0, size); + old_format, features, size); if (r < 0) { cerr << "import failed: " << cpp_strerror(-r) << std::endl; exit(1); |