From 1635bff4a9623a42b18837b116b364779a114a7b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 22 Jun 2011 08:56:47 -0700
Subject: [PATCH] osd: fix merge

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/osd/OSD.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d1b201f702d7b..e720108c4415f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5065,7 +5065,7 @@ void OSD::handle_op(MOSDOp *op)
     }
 
     // too big?
-    if (g_conf.osd_max_write_size &&
+    if (g_conf->osd_max_write_size &&
         op->get_data_len() > g_conf->osd_max_write_size << 20) {
       // journal can't hold commit!
       reply_op_error(op, -OSD_WRITETOOBIG);
-- 
2.39.5