From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Jun 2010 16:14:32 +0000 (-0700)
Subject: mkcephfs: error out of journal dev is included in btrfs devs
X-Git-Tag: v0.21~368
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=583f9f4296cea5b16b746f24e5ec1ec0cf3d4f06;p=ceph.git

mkcephfs: error out of journal dev is included in btrfs devs
---

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 6c1f2dc97223..9aed82088bdc 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -227,6 +227,11 @@ for name in $what; do
 	first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
 	get_conf btrfs_opt "noatime" "btrfs options"
 	[ -n "$btrfs_opt" ] && btrfs_opt="-o $btrfs_opt"
+
+	if [ -n "$osd_journal" ] && echo "$btrfs_devs" | grep -q -w "$osd_journal" ; then
+	    echo "ERROR: osd journal device ($osd_journal) also used by btrfs devs ($btrfs_devs)"
+	    continue
+	fi
 	
 	do_cmd "test -d $osd_data || mkdir -p $osd_data"
 	[ -n "$osd_journal" ] && do_cmd "test -d $osd_journal || mkdir -p `dirname $osd_journal`"