Land b_head_libcfs onto HEAD (20080805_1722)

[fs/lustre-release.git] / libcfs / include / libcfs / libcfsutil.h

diff --git a/libcfs/include/libcfs/types.h b/libcfs/include/libcfs/libcfsutil.h
similarity index 70%
rename from libcfs/include/libcfs/types.h
rename to libcfs/include/libcfs/libcfsutil.h
index 45018ee..5dad846 100644 (file)
--- a/libcfs/include/libcfs/types.h
+++ b/libcfs/include/libcfs/libcfsutil.h
@@ -32,22 +32,25 @@
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * libcfs/include/libcfs/libcfsutil.h
+ *
+ * A library used for userspace utilities.
+ *
  */
 
-#ifndef _LIBCFS_TYPES_H
-#define _LIBCFS_TYPES_H
+#ifndef __LIBCFSUTIL_H__
+#define __LIBCFSUTIL_H__
 
-/*
- * This file was inttroduced to resolve XT3 (Catamount) build issues.
- * The orignal idea was to move <lustre/types.h> here however at
- * the time of this writing
- * it's unclear what external dependencies are tied
- * to that file (It's not just some source file #including it)
- * there is some build/packaging infrastructure that includes it.
- * Hopefully that will be resolved shortly, that file will
- * be removed, its contents copied here and this comment can be deleted.
- */
+#ifndef LUSTRE_UTILS
+#define LUSTRE_UTILS 1
+#endif
 
-#include <lustre/types.h>
+#include <libcfs/libcfs.h>
 
-#endif
+#include <libcfs/util/platform.h>
+#include <libcfs/util/parser.h>
+#include <libcfs/util/libcfsutil_ioctl.h>
+
+
+#endif /* __LIBCFSUTIL_H__ */