All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 11/12] libfrog: move workqueue.h to libfrog/
Date: Tue, 03 Sep 2019 21:36:53 -0700	[thread overview]
Message-ID: <156757181354.1838135.14750040578517707289.stgit@magnolia> (raw)
In-Reply-To: <156757174409.1838135.8885359673458816401.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

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

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 include/Makefile   |    1 -
 include/input.h    |    2 +-
 include/project.h  |   39 ---------------------------------------
 libfrog/Makefile   |    1 +
 libfrog/paths.c    |    2 +-
 libfrog/projects.c |    2 +-
 libfrog/projects.h |   39 +++++++++++++++++++++++++++++++++++++++
 quota/quota.h      |    2 +-
 8 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 include/project.h
 create mode 100644 libfrog/projects.h


diff --git a/include/Makefile b/include/Makefile
index fc90bc48..a80867e4 100644
--- 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 57fdd343..3c3fa116 100644
--- 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/include/project.h b/include/project.h
deleted file mode 100644
index 3577dadb..00000000
--- a/include/project.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- */
-#ifndef __PROJECT_H__
-#define __PROJECT_H__
-
-#include "platform_defs.h"
-#include "xfs.h"
-
-extern int setprojid(const char *__name, int __fd, prid_t __id);
-extern int getprojid(const char *__name, int __fd, prid_t *__id);
-
-typedef struct fs_project {
-	prid_t		pr_prid;	/* project identifier */
-	char		*pr_name;	/* project name */
-} fs_project_t;
-
-extern void setprent(void);
-extern void endprent(void);
-extern fs_project_t *getprent(void);
-extern fs_project_t *getprnam(char *__name);
-extern fs_project_t *getprprid(prid_t __id);
-
-typedef struct fs_project_path {
-	prid_t		pp_prid;	/* project identifier */
-	char		*pp_pathname;	/* pathname to root of project tree */
-} fs_project_path_t;
-
-extern void setprpathent(void);
-extern void endprpathent(void);
-extern fs_project_path_t *getprpathent(void);
-
-extern void setprfiles(void);
-extern char *projid_file;
-extern char *projects_file;
-
-#endif	/* __PROJECT_H__ */
diff --git a/libfrog/Makefile b/libfrog/Makefile
index f8f7de68..25b5a03c 100644
--- 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 f0f4548e..32737223 100644
--- 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 91bc78f2..dbde9702 100644
--- 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/libfrog/projects.h b/libfrog/projects.h
new file mode 100644
index 00000000..77919474
--- /dev/null
+++ b/libfrog/projects.h
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ */
+#ifndef __LIBFROG_PROJECTS_H__
+#define __LIBFROG_PROJECTS_H__
+
+#include "platform_defs.h"
+#include "xfs.h"
+
+extern int setprojid(const char *__name, int __fd, prid_t __id);
+extern int getprojid(const char *__name, int __fd, prid_t *__id);
+
+typedef struct fs_project {
+	prid_t		pr_prid;	/* project identifier */
+	char		*pr_name;	/* project name */
+} fs_project_t;
+
+extern void setprent(void);
+extern void endprent(void);
+extern fs_project_t *getprent(void);
+extern fs_project_t *getprnam(char *__name);
+extern fs_project_t *getprprid(prid_t __id);
+
+typedef struct fs_project_path {
+	prid_t		pp_prid;	/* project identifier */
+	char		*pp_pathname;	/* pathname to root of project tree */
+} fs_project_path_t;
+
+extern void setprpathent(void);
+extern void endprpathent(void);
+extern fs_project_path_t *getprpathent(void);
+
+extern void setprfiles(void);
+extern char *projid_file;
+extern char *projects_file;
+
+#endif	/* __LIBFROG_PROJECTS_H__ */
diff --git a/quota/quota.h b/quota/quota.h
index 5db0a741..025d8877 100644
--- 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>
 
 /*


  parent reply	other threads:[~2019-09-04  4:37 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-04  4:35 [PATCH 00/12] libfrog: move header files Darrick J. Wong
2019-09-04  4:35 ` [PATCH 01/12] libxfs: move topology declarations into separate header Darrick J. Wong
2019-09-04 23:24   ` Dave Chinner
2019-09-04  4:35 ` [PATCH 02/12] libfrog: move avl64.h to libfrog/ Darrick J. Wong
2019-09-04 23:25   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 03/12] libfrog: move bitmap.h " Darrick J. Wong
2019-09-04 23:28   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 04/12] libfrog: move convert.h " Darrick J. Wong
2019-09-04 23:28   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 05/12] libfrog: move fsgeom.h " Darrick J. Wong
2019-09-04 23:32   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 06/12] libfrog: move ptvar.h " Darrick J. Wong
2019-09-04 23:32   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 07/12] libfrog: move radix-tree.h " Darrick J. Wong
2019-09-04 23:33   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 08/12] libfrog: move workqueue.h " Darrick J. Wong
2019-09-04 23:34   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 09/12] libfrog: move crc32c.h " Darrick J. Wong
2019-09-04 23:37   ` Dave Chinner
2019-09-04  4:36 ` [PATCH 10/12] libfrog: move path.h " Darrick J. Wong
2019-09-04 23:39   ` Dave Chinner
2019-09-04  4:36 ` Darrick J. Wong [this message]
2019-09-04 23:40   ` [PATCH 11/12] libfrog: move workqueue.h " Dave Chinner
2019-09-04  4:36 ` [PATCH 12/12] libfrog: move libfrog.h to libfrog/util.h Darrick J. Wong
2019-09-04 23:43   ` Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=156757181354.1838135.14750040578517707289.stgit@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.