From 583f9f4296cea5b16b746f24e5ec1ec0cf3d4f06 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Jun 2010 09:14:32 -0700 Subject: [PATCH] mkcephfs: error out of journal dev is included in btrfs devs --- src/mkcephfs.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 6c1f2dc97223c..9aed82088bdcb 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`" -- 2.39.5