Module Name: src Committed By: haad Date: Tue Oct 6 12:03:47 UTC 2009
Modified Files: src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_import.c Log Message: Replace another openat call with open + changed path. XXX. This commit should be reverted after proper implementation of *at syscalls. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c:1.1.1.1 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c:1.2 --- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c:1.1.1.1 Fri Aug 7 18:32:44 2009 +++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c Tue Oct 6 12:03:47 2009 @@ -860,7 +860,10 @@ (name[1] == 0 || (name[1] == '.' && name[2] == 0))) continue; - if ((fd = openat64(dfd, name, O_RDONLY)) < 0) + (void)snprintf(path, sizeof (path), "%s/%s", + rdsk, dp->d_name); + + if ((fd = open(path, O_RDONLY)) < 0) continue; /*