[PATCH 27/28] quota.h: move declarations to quota_types.h

From: Max Kellermann
Date: Wed Jan 31 2024 - 10:00:54 EST

Next message: Jens Axboe: "Re: [PATCH] trace/blktrace: fix task hung in blk_trace_remove"
Previous message: Max Kellermann: "[PATCH 21/28] percpu-refcount.h: move declarations to percpu-refcount_types.h"
In reply to: Max Kellermann: "[PATCH 21/28] percpu-refcount.h: move declarations to percpu-refcount_types.h"
Next in thread: Randy Dunlap: "Re: [PATCH 00/28] Fast kernel headers: reduce header dependencies"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

By providing declarations in a lean header, we can reduce header
dependencies.

Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx>
---
fs/gfs2/incore.h | 1 +
fs/xfs/xfs_qm.h | 1 +
fs/xfs/xfs_qm_syscalls.c | 2 ++
fs/xfs/xfs_quotaops.c | 1 +
fs/xfs/xfs_super.c | 1 +
fs/xfs/xfs_trans_dquot.c | 2 ++
include/linux/fs.h | 2 +-
include/linux/quota.h | 33 +-----------------
include/linux/quota_types.h | 68 +++++++++++++++++++++++++++++++++++++
9 files changed, 78 insertions(+), 33 deletions(-)
create mode 100644 include/linux/quota_types.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index e1343fd0a5b1..3cf177dd201c 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -18,6 +18,7 @@
#include <linux/rbtree.h>
#include <linux/ktime.h>
#include <linux/percpu.h>
+#include <linux/quota.h>
#include <linux/lockref.h>
#include <linux/rhashtable.h>
#include <linux/mutex.h>
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index d5c9fc4ba591..bb111cbc3567 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -9,6 +9,7 @@
#include "xfs_dquot_item.h"
#include "xfs_dquot.h"

+struct qc_dqblk;
struct xfs_inode;

extern struct kmem_cache *xfs_dqtrx_cache;
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 392cb39cc10c..1de4443bed40 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -19,6 +19,8 @@
#include "xfs_qm.h"
#include "xfs_icache.h"

+#include <linux/quota.h>
+
int
xfs_qm_scall_quotaoff(
xfs_mount_t *mp,
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 9c162e69976b..eda56d032734 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -15,6 +15,7 @@
#include "xfs_icache.h"
#include "xfs_qm.h"

+#include <linux/quota.h>

static void
xfs_qm_fill_state(
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5a2512d20bd0..1f893c99b956 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -48,6 +48,7 @@
#include <linux/magic.h>
#include <linux/fs_context.h>
#include <linux/fs_parser.h>
+#include <linux/quota.h>

static const struct super_operations xfs_super_operations;

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index aa00cf67ad72..94214f0baa2b 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -18,6 +18,8 @@
#include "xfs_trace.h"
#include "xfs_error.h"

+#include <linux/quota.h>
+
STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *);

/*
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 06eda3a4fb52..abe97d31849b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -261,7 +261,7 @@ struct iattr {
/*
* Includes for diskquotas.
*/
-#include <linux/quota.h>
+#include <linux/quota_types.h>

/*
* Maximum number of layers of fs stack. Needs to be limited to
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 956281c84850..2a3040e61072 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -32,9 +32,8 @@
#ifndef _LINUX_QUOTA_
#define _LINUX_QUOTA_

-#include <linux/list.h>
+#include <linux/quota_types.h>
#include <linux/mutex_types.h>
-#include <linux/rwsem_types.h>
#include <linux/spinlock_types.h>
#include <linux/percpu_counter.h>

@@ -45,7 +44,6 @@
#include <linux/atomic.h>
#include <linux/uidgid_types.h>
#include <linux/projid.h>
-#include <uapi/linux/quota.h>

#undef USRQUOTA
#undef GRPQUOTA
@@ -61,9 +59,6 @@ enum quota_type {
#define QTYPE_MASK_GRP (1 << GRPQUOTA)
#define QTYPE_MASK_PRJ (1 << PRJQUOTA)

-typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
-typedef long long qsize_t; /* Type in which we store sizes */
-
struct kqid { /* Type in which we store the quota identifier */
union {
kuid_t uid;
@@ -213,24 +208,6 @@ struct mem_dqblk {
time64_t dqb_itime; /* time limit for excessive inode use */
};

-/*
- * Data for one quotafile kept in memory
- */
-struct quota_format_type;
-
-struct mem_dqinfo {
- struct quota_format_type *dqi_format;
- int dqi_fmt_id; /* Id of the dqi_format - used when turning
- * quotas on after remount RW */
- struct list_head dqi_dirty_list; /* List of dirty dquots [dq_list_lock] */
- unsigned long dqi_flags; /* DFQ_ flags [dq_data_lock] */
- unsigned int dqi_bgrace; /* Space grace time [dq_data_lock] */
- unsigned int dqi_igrace; /* Inode grace time [dq_data_lock] */
- qsize_t dqi_max_spc_limit; /* Maximum space limit [static] */
- qsize_t dqi_max_ino_limit; /* Maximum inode limit [static] */
- void *dqi_priv;
-};
-
struct super_block;

/* Mask for flags passed to userspace */
@@ -517,14 +494,6 @@ static inline void quota_send_warning(struct kqid qid, dev_t dev,
}
#endif /* CONFIG_QUOTA_NETLINK_INTERFACE */

-struct quota_info {
- unsigned int flags; /* Flags for diskquotas on this device */
- struct rw_semaphore dqio_sem; /* Lock quota file while I/O in progress */
- struct inode *files[MAXQUOTAS]; /* inodes of quotafiles */
- struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */
- const struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
-};
-
int register_quota_format(struct quota_format_type *fmt);
void unregister_quota_format(struct quota_format_type *fmt);

diff --git a/include/linux/quota_types.h b/include/linux/quota_types.h
new file mode 100644
index 000000000000..7f52ee2604bb
--- /dev/null
+++ b/include/linux/quota_types.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Elz at The University of Melbourne.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _LINUX_QUOTA_TYPES_
+#define _LINUX_QUOTA_TYPES_
+
+#include <linux/list.h>
+#include <linux/rwsem_types.h>
+#include <uapi/linux/quota.h>
+
+typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
+typedef long long qsize_t; /* Type in which we store sizes */
+
+/*
+ * Data for one quotafile kept in memory
+ */
+struct quota_format_type;
+
+struct mem_dqinfo {
+ struct quota_format_type *dqi_format;
+ int dqi_fmt_id; /* Id of the dqi_format - used when turning
+ * quotas on after remount RW */
+ struct list_head dqi_dirty_list; /* List of dirty dquots [dq_list_lock] */
+ unsigned long dqi_flags; /* DFQ_ flags [dq_data_lock] */
+ unsigned int dqi_bgrace; /* Space grace time [dq_data_lock] */
+ unsigned int dqi_igrace; /* Inode grace time [dq_data_lock] */
+ qsize_t dqi_max_spc_limit; /* Maximum space limit [static] */
+ qsize_t dqi_max_ino_limit; /* Maximum inode limit [static] */
+ void *dqi_priv;
+};
+
+struct quota_info {
+ unsigned int flags; /* Flags for diskquotas on this device */
+ struct rw_semaphore dqio_sem; /* Lock quota file while I/O in progress */
+ struct inode *files[MAXQUOTAS]; /* inodes of quotafiles */
+ struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */
+ const struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
+};
+
+#endif /* _LINUX_QUOTA_TYPES_ */
--
2.39.2

Next message: Jens Axboe: "Re: [PATCH] trace/blktrace: fix task hung in blk_trace_remove"
Previous message: Max Kellermann: "[PATCH 21/28] percpu-refcount.h: move declarations to percpu-refcount_types.h"
In reply to: Max Kellermann: "[PATCH 21/28] percpu-refcount.h: move declarations to percpu-refcount_types.h"
Next in thread: Randy Dunlap: "Re: [PATCH 00/28] Fast kernel headers: reduce header dependencies"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]