From: Sage Weil <sage@inktank.com>
Date: Wed, 25 Sep 2013 04:46:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.71~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=952b39d4c4fcd1492234fcdba320895e4e520af5;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/osd/ReplicatedPG.cc
---

952b39d4c4fcd1492234fcdba320895e4e520af5
diff --cc src/osd/ReplicatedPG.cc
index 5cd5f538dbe4,9b4d069370ba..7d1738da5725
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -2960,7 -2898,8 +2960,8 @@@ int ReplicatedPG::do_osd_ops(OpContext 
      case CEPH_OSD_OP_SETXATTR:
        ++ctx->num_write;
        {
- 	if (op.xattr.value_len > cct->_conf->osd_max_attr_size) {
 -	if (g_conf->osd_max_attr_size > 0 &&
 -	    op.xattr.value_len > g_conf->osd_max_attr_size) {
++	if (cct->_conf->osd_max_attr_size > 0 &&
++	    op.xattr.value_len > cct->_conf->osd_max_attr_size) {
  	  result = -EFBIG;
  	  break;
  	}