diff options
Diffstat (limited to 'cmd/zpool')
| -rw-r--r-- | cmd/zpool/zpool_main.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 884f0a62f..bfef6fc43 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -1220,6 +1220,26 @@ zpool_do_remove(int argc, char **argv) } /* + * Return 1 if a vdev is active (being used in a pool) + * Return 0 if a vdev is inactive (offlined or faulted, or not in active pool) + * + * This is useful for checking if a disk in an active pool is offlined or + * faulted. + */ +static int +vdev_is_active(char *vdev_path) +{ + int fd; + fd = open(vdev_path, O_EXCL); + if (fd < 0) { + return (1); /* cant open O_EXCL - disk is active */ + } + + close(fd); + return (0); /* disk is inactive in the pool */ +} + +/* * zpool labelclear [-f] <vdev> * * -f Force clearing the label for the vdevs which are members of @@ -1328,9 +1348,23 @@ zpool_do_labelclear(int argc, char **argv) case POOL_STATE_ACTIVE: case POOL_STATE_SPARE: case POOL_STATE_L2CACHE: + /* + * We allow the user to call 'zpool offline -f' + * on an offlined disk in an active pool. We can check if + * the disk is online by calling vdev_is_active(). + */ + if (force && !vdev_is_active(vdev)) + break; + (void) fprintf(stderr, gettext( - "%s is a member (%s) of pool \"%s\"\n"), + "%s is a member (%s) of pool \"%s\""), vdev, zpool_pool_state_to_name(state), name); + + if (force) { + (void) fprintf(stderr, gettext( + ". Offline the disk first to clear its label.")); + } + printf("\n"); ret = 1; goto errout; |