eal/linux: fix remaining checks for 64-bit architectures

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_hugepage_info.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 902cc58..590cb56 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -71,7 +71,7 @@ get_num_hugepages(const char *subdir)
        const char *nr_rsvd_file = "resv_hugepages";
 
        /* first, check how many reserved pages kernel reports */
-       rte_snprintf(path, sizeof(path), "%s/%s/%s",
+       snprintf(path, sizeof(path), "%s/%s/%s",
                        sys_dir_path, subdir, nr_rsvd_file);
 
        if (eal_parse_sysfs_value(path, &resv_pages) < 0)
@@ -86,7 +86,7 @@ get_num_hugepages(const char *subdir)
 
        memset(path, 0, sizeof(path));
 
-       rte_snprintf(path, sizeof(path), "%s/%s/%s",
+       snprintf(path, sizeof(path), "%s/%s/%s",
                        sys_dir_path, subdir, nr_hp_file);
 
        if (eal_parse_sysfs_value(path, &num_pages) < 0)
@@ -311,17 +311,20 @@ eal_hugepage_info_init(void)
                                /* if blocking lock failed */
                                if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
                                        RTE_LOG(CRIT, EAL, "Failed to lock hugepage directory!\n");
+                                       closedir(dir);
                                        return -1;
                                }
                                /* clear out the hugepages dir from unused pages */
-                               if (clear_hugedir(hpi->hugedir) == -1)
+                               if (clear_hugedir(hpi->hugedir) == -1) {
+                                       closedir(dir);
                                        return -1;
+                               }
 
                                /* for now, put all pages into socket 0,
                                 * later they will be sorted */
                                hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
 
-#ifndef RTE_ARCH_X86_64
+#ifndef RTE_ARCH_64
                                /* for 32-bit systems, limit number of hugepages to 1GB per page size */
                                hpi->num_pages[0] = RTE_MIN(hpi->num_pages[0],
                                                RTE_PGSIZE_1G / hpi->hugepage_sz);