From a414fd51c7c5ae5dbe9e3af7db6f17741a58c1a7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 11 Feb 2012 13:43:23 -0800 Subject: [PATCH] init-ceph, mkcephfs: try 'btrfs device scan' before 'btrfsctl -a' Fixes: #2023 Reported-by: Wido den Hollander Signed-off-by: Sage Weil --- src/init-ceph.in | 2 +- src/mkcephfs.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init-ceph.in b/src/init-ceph.in index 701701f2f1ebb..72249f997255d 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -268,7 +268,7 @@ for name in $what; do [ -n "$btrfs_opt" ] && btrfs_opt="-o $btrfs_opt" [ -n "$pre_mount" ] && do_cmd "$pre_mount" echo Mounting Btrfs on $host:$btrfs_path - do_root_cmd "modprobe btrfs ; btrfsctl -a ; egrep -q '^[^ ]+ $btrfs_path' /proc/mounts || mount -t btrfs $btrfs_opt $first_dev $btrfs_path" + do_root_cmd "modprobe btrfs ; btrfs device scan || btrfsctl -a ; egrep -q '^[^ ]+ $btrfs_path' /proc/mounts || mount -t btrfs $btrfs_opt $first_dev $btrfs_path" fi echo Starting Ceph $name on $host... get_conf pre_start_eval "" "pre start eval" diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 83fb932f0dc13..17b6014474d37 100644 --- a/src/mkcephfs.in +++ b/src/mkcephfs.in @@ -332,7 +332,7 @@ if [ -n "$prepareosdfs" ]; then modprobe btrfs || true mkfs.btrfs $btrfs_devs - btrfsctl -a + btrfs device scan || btrfsctl -a mount -t btrfs $btrfs_opt $first_dev $btrfs_path chown $osd_user $btrfs_path chmod +w $btrfs_path -- 2.39.5