diff options
| author | Sage Weil <sage@newdream.net> | 2010-06-17 09:14:32 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-06-17 09:29:36 -0700 |
| commit | 583f9f4296cea5b16b746f24e5ec1ec0cf3d4f06 (patch) | |
| tree | a28c1fa187b1fbd499c9d78f955b7ad004ec440d /src/mkcephfs.in | |
| parent | b4727229402af1206109ceb7b5e8e19209ccf316 (diff) | |
| download | ceph-583f9f4296cea5b16b746f24e5ec1ec0cf3d4f06.tar.gz | |
mkcephfs: error out of journal dev is included in btrfs devs
Diffstat (limited to 'src/mkcephfs.in')
| -rw-r--r-- | src/mkcephfs.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 6c1f2dc9722..9aed82088bd 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`" |