From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 30 Mar 2015 03:22:09 +0000 (+0800)
Subject: osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size
X-Git-Tag: v9.0.0~62^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad15f7d795c5eb5beb3fe85bb63912524dffbd8f;p=ceph.git

osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Fixes:11120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/osdc/Striper.cc b/src/osdc/Striper.cc
index cca7686ca90c..a8682ded99bf 100644
--- a/src/osdc/Striper.cc
+++ b/src/osdc/Striper.cc
@@ -59,6 +59,10 @@ void Striper::file_to_extents(CephContext *cct, const char *object_format,
   __u32 su = layout->fl_stripe_unit;
   __u32 stripe_count = layout->fl_stripe_count;
   assert(object_size >= su);
+  if (stripe_count == 1) {
+    ldout(cct, 20) << " sc is one, reset su to os" << dendl;
+    su = object_size;
+  }
   uint64_t stripes_per_object = object_size / su;
   ldout(cct, 20) << " su " << su << " sc " << stripe_count << " os " << object_size
 		 << " stripes_per_object " << stripes_per_object << dendl;