diff options
| author | sjelinek <none@none> | 2005-10-27 09:01:18 -0700 |
|---|---|---|
| committer | sjelinek <none@none> | 2005-10-27 09:01:18 -0700 |
| commit | 3e1bd7a2aaeb6188caef90679b98088cfef1edc6 (patch) | |
| tree | f96d6ce4a25ea39514dd8b1fd2a23978cabc5055 /usr/src/lib/libdiskmgt/common/media.c | |
| parent | 108322fb1c3ed341aba9c80c9774df0ed9e35768 (diff) | |
| download | illumos-joyent-3e1bd7a2aaeb6188caef90679b98088cfef1edc6.tar.gz | |
PSARC 2004/776 device checking for fs utilities
PSARC 2005/461 Device in use checking environment variables
5084421 libdiskmgt needs to detect in use ZFS data
5085739 remove workaround for bug 4725434
6194015 Device in use checking for Solaris utilities-PSARC/2004/776
6261853 libdiskmgt does not work correctly in all cases on amd64
6268374 libdiskmgt allocates incorrect size for readdir_r() dirent argument
6291309 PSARC/2005/461 - libdiskmgt should enable bypassing of inuse checking
6301815 PSARC/2005/461-Need Sun private libdiskmgt flag for use during install to disable sysevent starting
--HG--
rename : usr/src/cmd/format/checkmount.c => usr/src/cmd/format/checkdev.c
rename : usr/src/cmd/format/checkmount.h => usr/src/cmd/format/checkdev.h
Diffstat (limited to 'usr/src/lib/libdiskmgt/common/media.c')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/media.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/usr/src/lib/libdiskmgt/common/media.c b/usr/src/lib/libdiskmgt/common/media.c index 364ff92d2a..ac29898ede 100644 --- a/usr/src/lib/libdiskmgt/common/media.c +++ b/usr/src/lib/libdiskmgt/common/media.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -440,27 +440,6 @@ apply_filter(descriptor_t **media, int filter[], int *errp) cache_free_descriptor(media[i]); } } -#ifdef i386 - /* XXX Work around bug 4725434 */ - else if (!media[i]->p.disk->removable) { - int j; - int match; - - match = 0; - for (j = 0; filter[j] != DM_FILTER_END; j++) { - if (DM_MT_FIXED == filter[j]) { - found[pos++] = media[i]; - match = 1; - break; - } - } - - if (!match) { - cache_free_descriptor(media[i]); - } - } -#endif - (void) close(fd); } found[pos] = NULL; @@ -506,10 +485,6 @@ get_attrs(disk_t *dp, int fd, nvlist_t *attrs) /* The first thing to do is read the media */ if (!media_read_info(fd, &minfo)) { - /* XXX Work around bug 4725434 */ -#ifdef i386 - if (dp->removable) -#endif return (ENODEV); } |