Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-16 14:33:59 -08:00
commit 79bc1b23ed
1 changed files with 2 additions and 2 deletions

View File

@ -212,12 +212,12 @@ is_shared(libzfs_handle_t *hdl, const char *mountpoint, zfs_share_proto_t proto)
* informative error message.
*/
static boolean_t
dir_is_empty(const char *dirname)
dir_is_empty(const char *dirn)
{
DIR *dirp;
struct dirent64 *dp;
if ((dirp = opendir(dirname)) == NULL)
if ((dirp = opendir(dirn)) == NULL)
return (B_TRUE);
while ((dp = readdir64(dirp)) != NULL) {