]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: Don't use the return value of getattr_maybe_cache as attr length.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 23 Sep 2014 08:47:32 +0000 (16:47 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Fri, 12 Dec 2014 06:38:25 +0000 (14:38 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/ReplicatedPG.cc

index f5898ebb9aebcdc3125381da907d0e5b9a10e851..9addff11125ab4d52841ad966c6a5738da3675c4 100644 (file)
@@ -3669,12 +3669,13 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
          name,
          &(osd_op.outdata));
        if (r >= 0) {
-         op.xattr.value_len = r;
+         op.xattr.value_len = osd_op.outdata.length();
          result = 0;
-         ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(r, 10);
-         ctx->delta_stats.num_rd++;
+         ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(osd_op.outdata.length(), 10);
        } else
          result = r;
+
+       ctx->delta_stats.num_rd++;
       }
       break;