From: Dan Mick <dan.mick@inktank.com>
Date: Sat, 30 Jun 2012 04:42:29 +0000 (-0700)
Subject: librbd: handle NULL old_format pointer in detect_format()'s logging
X-Git-Tag: v0.50~104^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2d37c529de851fdc735bb9179084062714985ee;p=ceph.git

librbd: handle NULL old_format pointer in detect_format()'s logging

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/librbd.cc b/src/librbd.cc
index 2881e246c2e9..e5178679d6c9 100644
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -128,7 +128,8 @@ namespace librbd {
     }
 
     ldout(cct, 20) << "detect format of " << name << " : "
-		   << (*old_format ? "old" : "new") << dendl;
+		   << (old_format ? (*old_format ? "old" : "new") :
+		       "don't care")  << dendl;
     return 0;
   }