On Thu, Aug 23, 2012 at 11:02:23AM +0800, dyoung@xxxxxxxxxx wrote:
> For lvm, multipath, iscsi modules they do not care about the filesystem,
> Also there could be devcie in host_devs but it does not get formated.
>
> For these kind of modules, use for_each_host_dev_and_slaves will be better than use
> for_each_host_dev_fs, here add a new function to iterate the host_devs and
> their slave devices.
>
> In original for_each_host_dev_fs, it will call check_block_and_slaves which
> will return once helper function return 0, but this is not enough for kdump
> iscsi setup. For kdump iscsi case, it need setup each slave devices so that
> the iscsi target can be properly setuped in initramfs.
>
> Thus, this patch also add new functions check_block_and_slaves_all and
> for_each_host_dev_and_slaves_all.
I think this patch should be broken in two parts for more clarity.
- Fix the kdump iscsi issue where we don't expect to break out of the
loop the moment first iscsi device is found.
- Start using host_dev instead of host_dev_fs for modules which don't
care about fs. Also why to have host_devs[] and host_fs_types[] both.
Looks like host_fs_types contains both device and fs information. I
think that includes strings like LVM etc.
So can we merge both into one and those modules who don't require fs
info will ignore it. Or, keep one data structure host_dev_fs_types,
and provide two helper functions. One which provdes on $dev in $1
and other which provides both dev and fs as argument to the function.
This is more of a clean up thing and it is not necessary for this
patchset. So if you find it is too much of work, just split this patch
in two for clarity. Also put some comments about what's the difference
between for_each_host_dev_and_slaves() and for_each_host_dev_and_slaves_all()
Thanks
Vivek
>
> Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
> Tested-by: WANG Chao <chaowang@xxxxxxxxxx>
> ---
> dracut-functions.sh | 48 +++++++++++++++++++++++++++++++++-
> modules.d/90lvm/module-setup.sh | 4 +-
> modules.d/90multipath/module-setup.sh | 5 +--
> modules.d/95iscsi/module-setup.sh | 5 +--
> 4 files changed, 53 insertions(+), 9 deletions(-)
>
> --- dracut.orig/dracut-functions.sh
> +++ dracut/dracut-functions.sh
> @@ -383,7 +383,6 @@ find_mp_fstype() {
> return 1
> }
>
> -
> # finds the major:minor of the block device backing the root filesystem.
> find_root_block_device() { find_block_device /; }
>
> @@ -429,6 +428,53 @@ check_block_and_slaves() {
> return 1
> }
>
> +check_block_and_slaves_all() {
> + local _x _ret=1
> + [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry.
> + if "$1" $2; then
> + _ret=0
> + fi
> + check_vol_slaves "$@" && return 0
> + if [[ -f /sys/dev/block/$2/../dev ]]; then
> + check_block_and_slaves_all $1 $(cat "/sys/dev/block/$2/../dev") && _ret=0
> + fi
> + [[ -d /sys/dev/block/$2/slaves ]] || return 1
> + for _x in /sys/dev/block/$2/slaves/*/dev; do
> + [[ -f $_x ]] || continue
> + check_block_and_slaves_all $1 $(cat "$_x") && _ret=0
> + done
> + return $_ret
> +}
> +# for_each_host_dev_and_slaves <func>
> +# Execute "<func> <dev>" for every "<dev>" found
> +# in ${host_devs[@]} and their slaves
> +for_each_host_dev_and_slaves_all()
> +{
> + local _func="$1"
> + local _dev
> + local _ret=1
> + for _dev in ${host_devs[@]}; do
> + [[ -b "$_dev" ]] || continue
> + echo host_devs: $_dev
> + if check_block_and_slaves_all $_func $(get_maj_min $_dev); then
> + _ret=0
> + fi
> + done
> + return $_ret
> +}
> +
> +for_each_host_dev_and_slaves()
> +{
> + local _func="$1"
> + local _dev
> + for _dev in ${host_devs[@]}; do
> + [[ -b "$_dev" ]] || continue
> + echo host_devs: $_dev
> + check_block_and_slaves_all $_func $(get_maj_min $_dev) && return 0
> + done
> + return 1
> +}
> +
> # ugly workaround for the lvm design
> # There is no volume group device,
> # so, there are no slave devices for volume groups.
> --- dracut.orig/modules.d/90lvm/module-setup.sh
> +++ dracut/modules.d/90lvm/module-setup.sh
> @@ -9,7 +9,7 @@ check() {
>
> check_lvm() {
> local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
> - eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
> + eval $(udevadm info --query=property --name=/dev/block/$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
> [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
> [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
> if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
> @@ -22,7 +22,7 @@ check() {
> }
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs check_lvm || return 1
> + for_each_host_dev_and_slaves check_lvm || return 1
> }
>
> return 0
> --- dracut.orig/modules.d/90multipath/module-setup.sh
> +++ dracut/modules.d/90multipath/module-setup.sh
> @@ -8,15 +8,14 @@ check() {
> type -P multipath >/dev/null || return 1
>
> is_mpath() {
> - local _dev
> - _dev=$(get_maj_min $1)
> + local _dev=$1
> [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1
> [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ mpath- ]] && return 0
> return 1
> }
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs is_mpath || return 1
> + for_each_host_dev_and_slaves is_mpath || return 1
> }
>
> return 0
> --- dracut.orig/modules.d/95iscsi/module-setup.sh
> +++ dracut/modules.d/95iscsi/module-setup.sh
> @@ -11,8 +11,7 @@ check() {
> # booting from root.
>
> is_iscsi() (
> - local _dev
> - _dev=$(get_maj_min $1)
> + local _dev=$1
>
> [[ -L /sys/dev/block/$_dev ]] || return
> cd "$(readlink -f /sys/dev/block/$_dev)"
> @@ -23,7 +22,7 @@ check() {
> )
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs is_iscsi || return 1
> + for_each_host_dev_and_slaves is_iscsi || return 1
> }
> return 0
> }
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
