tailq: remove unneeded inclusions

[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 4ffeda5..028e309 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -47,7 +47,6 @@
 
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_launch.h>
 #include <rte_per_lcore.h>
@@ -71,7 +70,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)
@@ -84,9 +83,7 @@ get_num_hugepages(const char *subdir)
        else
                nr_hp_file = "free_hugepages";
 
-       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 +308,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);