]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: handle NULL old_format pointer in detect_format()'s logging
authorDan Mick <dan.mick@inktank.com>
Sat, 30 Jun 2012 04:42:29 +0000 (21:42 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 2 Jul 2012 21:18:21 +0000 (14:18 -0700)
Signed-off-by: Dan Mick <dan.mick@inktank.com>
src/librbd.cc

index 2881e246c2e92faeff557f37a7bc36ceeee78449..e5178679d6c9ac7e6b75ed921c0d0db9fd97341a 100644 (file)
@@ -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;
   }