Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
This commit is contained in:
commit
79bc1b23ed
|
@ -212,12 +212,12 @@ is_shared(libzfs_handle_t *hdl, const char *mountpoint, zfs_share_proto_t proto)
|
||||||
* informative error message.
|
* informative error message.
|
||||||
*/
|
*/
|
||||||
static boolean_t
|
static boolean_t
|
||||||
dir_is_empty(const char *dirname)
|
dir_is_empty(const char *dirn)
|
||||||
{
|
{
|
||||||
DIR *dirp;
|
DIR *dirp;
|
||||||
struct dirent64 *dp;
|
struct dirent64 *dp;
|
||||||
|
|
||||||
if ((dirp = opendir(dirname)) == NULL)
|
if ((dirp = opendir(dirn)) == NULL)
|
||||||
return (B_TRUE);
|
return (B_TRUE);
|
||||||
|
|
||||||
while ((dp = readdir64(dirp)) != NULL) {
|
while ((dp = readdir64(dirp)) != NULL) {
|
||||||
|
|
Loading…
Reference in New Issue