RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/rbd: use create4() for both of format 1 and format 2.

Browse Source 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
This commit is contained in:
Dongsheng Yang 2016-07-11 07:44:24 -04:00
parent a187b346d7
commit 6264acb469
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/tools/rbd/action/Import.cc
View File

@ -131,28 +131,7 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
}
uint64_t format;
r = opts.get(RBD_IMAGE_OPTION_FORMAT, &format);
assert(r == 0);
if (format == 1) {
uint64_t stripe_unit, stripe_count;
r = opts.get(RBD_IMAGE_OPTION_STRIPE_UNIT, &stripe_unit);
assert(r == 0);
r = opts.get(RBD_IMAGE_OPTION_STRIPE_COUNT, &stripe_count);
assert(r == 0);
// weird striping not allowed with format 1!
if ((stripe_unit || stripe_count) &&
(stripe_unit != (1ull << order) && stripe_count != 1)) {
std::cerr << "non-default striping not allowed with format 1; "
<< "use --image-format 2" << std::endl;
return -EINVAL;
}
int order_ = order;
r = rbd.create(io_ctx, imgname, size, &order_);
} else {
r = rbd.create4(io_ctx, imgname, size, opts);
}
r = rbd.create4(io_ctx, imgname, size, opts);
if (r < 0) {
std::cerr << "rbd: image creation failed" << std::endl;
goto done;