From: Sébastien Han <sebastien.han@enovance.com>
Date: Fri, 10 Oct 2014 12:14:22 +0000 (+0200)
Subject: Fix error message when stripping with format 1
X-Git-Tag: v0.88~85^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2688%2Fhead;p=ceph.git

Fix error message when stripping with format 1

Since the option '--format' for specifying the rbd image format is
deprecated, we should recommend '--image-format' instead.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 01e8a86843e6..2d52439c3efd 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -421,7 +421,7 @@ static int do_create(librbd::RBD &rbd, librados::IoCtx& io_ctx,
     // weird striping not allowed with format 1!
     if ((stripe_unit || stripe_count) &&
 	(stripe_unit != (1ull << *order) && stripe_count != 1)) {
-      cerr << "non-default striping not allowed with format 1; use --format 2"
+      cerr << "non-default striping not allowed with format 1; use --image-format 2"
 	   << std::endl;
       return -EINVAL;
     }