diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2010-11-01 14:17:35 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2010-11-01 14:17:35 +0000 |
| commit | 2955b913ea0c34e12723537abc9af9cc8d14c3b3 (patch) | |
| tree | 3c1c63adc54e96cf9253a0c8c7d346faa26540d9 /tools/lvresize.c | |
| parent | 13047cca5ac6caa204f39cbb8ac72dfd615f129f (diff) | |
| download | lvm2-2955b913ea0c34e12723537abc9af9cc8d14c3b3.tar.gz lvm2-2955b913ea0c34e12723537abc9af9cc8d14c3b3.tar.xz lvm2-2955b913ea0c34e12723537abc9af9cc8d14c3b3.zip | |
Use new status code from fsadm check
Patch updates exec_cmd() and adds 3rd parameter with pointer for
status value, so caller might examine returned status code.
If the passed pointer is NULL, behavior is unmodified.
Patch allows to confinue with lvresize if the failure from fsadm check is
caused by mounted filesystem as many of filesystem resize tools do support
online filesystem resize. (originally user had to use flag '-n' to bypass
this filesystem check)
Diffstat (limited to 'tools/lvresize.c')
| -rw-r--r-- | tools/lvresize.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/lvresize.c b/tools/lvresize.c index 018dfc2e..ca707f40 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -129,6 +129,7 @@ static int _request_confirmation(struct cmd_context *cmd, enum fsadm_cmd_e { FSADM_CMD_CHECK, FSADM_CMD_RESIZE }; #define FSADM_CMD "fsadm" #define FSADM_CMD_MAX_ARGS 6 +#define FSADM_CHECK_FAILS_FOR_MOUNTED 3 /* shell exist status code */ /* * FSADM_CMD --dry-run --verbose --force check lv_path @@ -137,7 +138,8 @@ enum fsadm_cmd_e { FSADM_CMD_CHECK, FSADM_CMD_RESIZE }; static int _fsadm_cmd(struct cmd_context *cmd, const struct volume_group *vg, const struct lvresize_params *lp, - enum fsadm_cmd_e fcmd) + enum fsadm_cmd_e fcmd, + int *status) { char lv_path[PATH_MAX]; char size_buf[SIZE_BUF]; @@ -177,7 +179,7 @@ static int _fsadm_cmd(struct cmd_context *cmd, argv[i] = NULL; - return exec_cmd(cmd, argv); + return exec_cmd(cmd, argv, status); } static int _lvresize_params(struct cmd_context *cmd, int argc, char **argv, @@ -321,6 +323,7 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, struct lv_segment *seg, *uninitialized_var(mirr_seg); uint32_t seg_extents; uint32_t sz, str; + int status; struct dm_list *pvh = NULL; int use_policy = arg_count(cmd, use_policies_ARG); @@ -637,13 +640,16 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, if (lp->resizefs) { if (!lp->nofsck && - !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_CHECK)) { - stack; - return ECMD_FAILED; + !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_CHECK, &status)) { + if (status != FSADM_CHECK_FAILS_FOR_MOUNTED) { + stack; + return ECMD_FAILED; + } + /* some filesystems supports online resize */ } if ((lp->resize == LV_REDUCE) && - !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_RESIZE)) { + !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_RESIZE, NULL)) { stack; return ECMD_FAILED; } @@ -711,7 +717,7 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, log_print("Logical volume %s successfully resized", lp->lv_name); if (lp->resizefs && (lp->resize == LV_EXTEND) && - !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_RESIZE)) { + !_fsadm_cmd(cmd, vg, lp, FSADM_CMD_RESIZE, NULL)) { stack; return ECMD_FAILED; } |