libfrog: move workqueue.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/Makefile b/include/Makefile
index fc90bc4832961b9754df263e184d24f825f2b8bc..a80867e402178265b8db0b763ba768132e14c337 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -28,7 +28,6 @@ LIBHFILES = libxfs.h \
        xfs_trans.h \
        command.h \
        input.h \
-       project.h \
        platform_defs.h
 
 HFILES = handle.h \

diff --git a/include/input.h b/include/input.h
index 57fdd343960297e872279ce41266a033fca05986..3c3fa1161ed0b19635b79a6f9f2dddfd26068d8d 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -9,7 +9,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <sys/types.h>
-#include "project.h"
+#include "libfrog/projects.h"
 #include "libfrog/convert.h"
 #include <stdbool.h>
 

diff --git a/libfrog/Makefile b/libfrog/Makefile
index f8f7de68c1dc7e91eb6b4767dcdbfcbe4449eb2b..25b5a03cd2218a460fa2ea5090627d8ba62e7b71 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -38,6 +38,7 @@ crc32defs.h \
 crc32table.h \
 fsgeom.h \
 paths.h \
+projects.h \
 ptvar.h \
 radix-tree.h \
 topology.h \

diff --git a/libfrog/paths.c b/libfrog/paths.c
index f0f4548ee42bf367e3fd2e1dfc0ececc3ea47a6a..327372237dd337cf54e662f6b2b227d0543fa1dc 100644 (file)
--- a/libfrog/paths.c
+++ b/libfrog/paths.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "paths.h"
 #include "input.h"
-#include "project.h"
+#include "projects.h"
 #include <limits.h>
 
 extern char *progname;

diff --git a/libfrog/projects.c b/libfrog/projects.c
index 91bc78f2423e6678bb0eacc14407d7c17f1fc2f3..dbde97021c63eb02fd9112297349c7116a1c18b1 100644 (file)
--- a/libfrog/projects.c
+++ b/libfrog/projects.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "project.h"
+#include "projects.h"
 
 #define PROJID         "/etc/projid"
 #define PROJECT_PATHS  "/etc/projects"

diff --git a/include/project.h b/libfrog/projects.h
similarity index 90%
rename from include/project.h
rename to libfrog/projects.h
index 3577dadb54e7ab4faeeeae493173fec68707b822..779194749edbc72815532232099ee04c2db76adb 100644 (file)
--- a/include/project.h
+++ b/libfrog/projects.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef __PROJECT_H__
-#define __PROJECT_H__
+#ifndef __LIBFROG_PROJECTS_H__
+#define __LIBFROG_PROJECTS_H__
 
 #include "platform_defs.h"
 #include "xfs.h"
@@ -36,4 +36,4 @@ extern void setprfiles(void);
 extern char *projid_file;
 extern char *projects_file;
 
-#endif /* __PROJECT_H__ */
+#endif /* __LIBFROG_PROJECTS_H__ */

diff --git a/quota/quota.h b/quota/quota.h
index 5db0a7419711f13dab7535c728ced40d31a473ae..025d887726d8d1b6840ba857316fc488e6896b55 100644 (file)
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -6,7 +6,7 @@
 
 #include "xqm.h"
 #include "libfrog/paths.h"
-#include "project.h"
+#include "libfrog/projects.h"
 #include <stdbool.h>
 
 /*