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

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 6c1f2dc97223cc736ed00a666f0fccca67a58086..9aed82088bdcbaa36fe79506b45b5e8b0ee8ac01 100644 (file)
--- 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`"