From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Oct 2017 20:29:32 +0000 (-0500)
Subject: os/bluestore: 0-length zero should not change object size
X-Git-Tag: v12.2.3~190^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51b380a0a74f0335a04d1121042449909549c976;p=ceph.git

os/bluestore: 0-length zero should not change object size

Fixes: http://tracker.ceph.com/issues/21712
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b588eaf2b0fdf06c94104d5a542bd571499f2b85)
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 47eb571b426c..541b000478da 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -10568,7 +10568,7 @@ int BlueStore::_do_zero(TransContext *txc,
   o->extent_map.dirty_range(offset, length);
   _wctx_finish(txc, c, o, &wctx);
 
-  if (offset + length > o->onode.size) {
+  if (length > 0 && offset + length > o->onode.size) {
     o->onode.size = offset + length;
     dout(20) << __func__ << " extending size to " << offset + length
 	     << dendl;