From 5b2de2b9d6188e3f526a394b11bd3dbaace5d41b Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Tue, 5 Jul 2011 14:56:51 -0700
Subject: [PATCH] mkcephfs: Only create OSD journal dir if we have a journal.

Thanks to huang jun <hjwsm1989@gmail.com> for finding the bug.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
---
 src/mkcephfs.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index f266843b1535e..d4d5092bf9386 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -299,7 +299,9 @@ if [ -n "$prepareosdfs" ]; then
     
     test -d $osd_data || mkdir -p $osd_data
 
-    [ -n "$osd_journal" ] && test -d $osd_journal || mkdir -p `dirname $osd_journal`
+    if [ -n "$osd_journal" ]; then
+	test -d $osd_journal || mkdir -p `dirname $osd_journal`
+    fi
 
     umount $btrfs_path || true
     for f in $btrfs_devs ; do
-- 
2.39.5