diff options
Diffstat (limited to 'usr/src/lib/libdiskmgt/common')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/inuse_fs.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/usr/src/lib/libdiskmgt/common/inuse_fs.c b/usr/src/lib/libdiskmgt/common/inuse_fs.c index 1dafdc05e5..e3f25b2156 100644 --- a/usr/src/lib/libdiskmgt/common/inuse_fs.c +++ b/usr/src/lib/libdiskmgt/common/inuse_fs.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -207,6 +206,16 @@ load_heuristics() continue; } + /* + * Skip checking for ZFS filesystems. We know that + * inuse_zpool() will have already been called, which does a + * better job of checking anyway. More importantly, an unused + * hot spare will still claim to have a ZFS filesystem because + * it doesn't do the same level of checks. + */ + if (strcmp(dp->d_name, "zfs") == 0) + continue; + (void) snprintf(path, sizeof (path), "/usr/lib/fs/%s", dp->d_name); |