Add missing log_error() to lvresize command when fsadm tool fails

Also add test case

diff --git a/WHATS_NEW b/WHATS_NEW
index 420756f8cd397050003d66fe2d921d1d5b2e4f13..e7fd3773fede56ebb950bc3bd6dfc253b812a752 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Add missing log_error() to lvresize command when fsadm tool fails.
   Add support for DM_DEV_DIR device path into fsadm script.
   Support different PATH setting for fsadm script testing.
   Surround all executed commands with quotes in fsadm script.

diff --git a/test/t-fsadm.sh b/test/t-fsadm.sh
index 22619170ddab36463bdde8baa9304727a7c21386..a881f2bb7d27a3bc6b64639e851b160b0f7720d9 100644 (file)
--- a/test/t-fsadm.sh
+++ b/test/t-fsadm.sh
@@ -83,6 +83,7 @@ if check_missing ext3; then
        fscheck_ext3
        mount $dev_vg_lv $mount_dir
        not fsadm -y --lvresize resize $vg_lv 4M
+       echo n | not lvresize -L4M -r -n $vg_lv
        lvresize -L+20M -r -n $vg_lv
        umount $mount_dir
        fscheck_ext3

diff --git a/tools/lvresize.c b/tools/lvresize.c
index ccd6c6e20985d305288677b4a7d622f110b8f58f..96e623e1d4503e27e6ad43a314af4a6edae9346c 100644 (file)
--- a/tools/lvresize.c
+++ b/tools/lvresize.c
@@ -676,15 +676,15 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg,
                if (!lp->nofsck &&
                    !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_CHECK, &status)) {
                        if (status != FSADM_CHECK_FAILS_FOR_MOUNTED) {
-                               stack;
+                               log_error("Filesystem check failed.");
                                return ECMD_FAILED;
                        }
-                        /* some filesystems supports online resize */
+                       /* some filesystems supports online resize */
                }
 
                if ((lp->resize == LV_REDUCE) &&
                    !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_RESIZE, NULL)) {
-                       stack;
+                       log_error("Filesystem resize failed.");
                        return ECMD_FAILED;
                }
        }