Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-05 12:46:42 -08:00
parent 13a9cddf73 0b8ab32645
commit 961644c617
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zfs/lib/libzfs/libzfs_import.c
View File

@ -791,7 +791,7 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
int i; int i;
DIR *dirp = NULL; DIR *dirp = NULL;
struct dirent64 *dp; struct dirent64 *dp;
char path[MAXPATHLEN]; char path[MAXPATHLEN], path2[MAXPATHLEN];
char *end; char *end;
size_t pathleft; size_t pathleft;
struct stat64 statbuf; struct stat64 statbuf;
@ -818,7 +818,6 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
*/ */
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
char *rdsk; char *rdsk;
int dfd;
/* use realpath to normalize the path */ /* use realpath to normalize the path */
if (realpath(argv[i], path) == 0) { if (realpath(argv[i], path) == 0) {
@ -842,8 +841,7 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
else else
rdsk = path; rdsk = path;
if ((dfd = open64(rdsk, O_RDONLY)) < 0 || if ((dirp = opendir(rdsk)) == NULL) {
(dirp = fdopendir(dfd)) == NULL) {
zfs_error_aux(hdl, strerror(errno)); zfs_error_aux(hdl, strerror(errno));
(void) zfs_error_fmt(hdl, EZFS_BADPATH, (void) zfs_error_fmt(hdl, EZFS_BADPATH,
dgettext(TEXT_DOMAIN, "cannot open '%s'"), dgettext(TEXT_DOMAIN, "cannot open '%s'"),
@ -860,20 +858,19 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
(name[1] == 0 || (name[1] == '.' && name[2] == 0))) (name[1] == 0 || (name[1] == '.' && name[2] == 0)))
continue; continue;
if ((fd = openat64(dfd, name, O_RDONLY)) < 0) snprintf(path2, sizeof (path2), "%s%s", rdsk, name);
continue;
/* /*
* Ignore failed stats. We only want regular * Ignore failed stats. We only want regular
* files, character devs and block devs. * files, character devs and block devs.
*/ */
if (fstat64(fd, &statbuf) != 0 || if (stat64(path2, &statbuf) != 0 ||
(!S_ISREG(statbuf.st_mode) && (!S_ISREG(statbuf.st_mode) &&
!S_ISCHR(statbuf.st_mode) && !S_ISBLK(statbuf.st_mode)))
!S_ISBLK(statbuf.st_mode))) { continue;
(void) close(fd);
if ((fd = open64(path2, O_RDONLY)) < 0)
continue; continue;
}
if ((zpool_read_label(fd, &config)) != 0) { if ((zpool_read_label(fd, &config)) != 0) {
(void) close(fd); (void) close(fd);
@ -906,9 +903,7 @@ zpool_find_import_impl(libzfs_handle_t *hdl, int argc, char **argv,
config = NULL; config = NULL;
continue; continue;
} }
/* use the non-raw path for the config */ if (add_config(hdl, &pools, path2, config) != 0)
(void) strlcpy(end, name, pathleft);
if (add_config(hdl, &pools, path, config) != 0)
goto error; goto error;
} }
} }