summaryrefslogtreecommitdiff
path: root/src/mkcephfs.in
diff options
context:
space:
mode:
authorTommi Virtanen <tommi.virtanen@dreamhost.com>2011-07-05 14:56:51 -0700
committerTommi Virtanen <tommi.virtanen@dreamhost.com>2011-07-05 14:57:10 -0700
commit5b2de2b9d6188e3f526a394b11bd3dbaace5d41b (patch)
treeccef0f53dc6c06592f97248a856fecf9f5e7b0d4 /src/mkcephfs.in
parent7e1f09ff4f2a0546be20060eae83b3eefeb28fde (diff)
downloadceph-5b2de2b9d6188e3f526a394b11bd3dbaace5d41b.tar.gz
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>
Diffstat (limited to 'src/mkcephfs.in')
-rw-r--r--src/mkcephfs.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index f266843b153..d4d5092bf93 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