New split of quota headers
Subsystems (3)
Jan Kara
reviewercover New split of quota headers
Hello Andrew,
after Adrian's comments and a bit of thinking, I've decided to split
quota headers differently which also solves the issue with new header file which should be exported. I found out it is enough to move some functions into quotaops.h where they logically also fit nicely. So please replace my patches:
+ ext4-add-explicit-include-of-linux-quotah-into-ext4_jbd2h.patch
+ ext2-add-explicit-include-of-linux-quotah-into-superc.patch
+ quota-split-out-quota_structh-out-of-quotah.patch
+ quota-convert-macros-to-inline-functions.patch
with the two patches which will follow. Thanks and sorry for additional work.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH 1/2 quota: Move function-macros from quota.h to quotaops.h
Move declarations of some macros, which should be in fact functions to quotaops.h. This way they can be later converted to inline functions because we can now use declarations from quota.h. Also add necessary includes of quotaops.h to a few files.
--- fs/ext2/super.c | 1 + fs/quota_v1.c | 1 + fs/quota_v2.c | 1 + include/linux/quota.h | 22 +++------------------- include/linux/quotaops.h | 25 +++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 19 deletions(-)
fs/ext2/super.c +1 -0
@@ -31,6 +31,7 @@#include <linux/seq_file.h> #include <linux/mount.h> #include <linux/log2.h> +#include <linux/quotaops.h> #include <asm/uaccess.h> #include "ext2.h" #include "xattr.h"
fs/quota_v1.c +1 -0
@@ -1,6 +1,7 @@#include <linux/errno.h> #include <linux/fs.h> #include <linux/quota.h> +#include <linux/quotaops.h> #include <linux/dqblk_v1.h> #include <linux/quotaio_v1.h> #include <linux/kernel.h>
fs/quota_v2.c +1 -0
@@ -11,6 +11,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> +#include <linux/quotaops.h> #include <asm/byteorder.h>
include/linux/quota.h +3 -19
@@ -41,9 +41,6 @@#define __DQUOT_VERSION__ "dquot_6.5.1"#define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 -typedef __kernel_uid32_t qid_t ;/* Type in which we store ids in memory */ -typedef __u64 qsize_t ;/* Type in which we store sizes */ -/* Size of blocks in which are counted size limits */ #define QUOTABLOCK_BITS 10#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS)
@@ -172,6 +169,9 @@ enum {#include <asm/atomic.h> +typedef __kernel_uid32_t qid_t ;/* Type in which we store ids in memory */ +typedef __u64 qsize_t ;/* Type in which we store sizes */ +extern spinlock_t dq_data_lock;/* Maximal numbers of writes for quota operation (insert/delete/update)
@@ -225,9 +225,6 @@ struct super_block;extern void mark_info_dirty (struct super_block *sb,int type);#define info_dirty (info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags) -#define sb_dqopt (sb) (&(sb)->s_dquot) -#define sb_dqinfo (sb, type) (sb_dqopt(sb)->info+(type)) -struct dqstats {int lookups;int drops;
@@ -335,19 +332,6 @@ struct quota_info {struct quota_format_ops *ops[MAXQUOTAS ];/* Operations for each type */ }; -#define sb_has_quota_enabled (sb, type) ((type)==USRQUOTA ? \ - (sb_dqopt(sb)->flags & DQUOT_USR_ENABLED) : (sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED)) - -#define sb_any_quota_enabled (sb) (sb_has_quota_enabled(sb, USRQUOTA) | \ - sb_has_quota_enabled(sb, GRPQUOTA)) - -#define sb_has_quota_suspended (sb, type) \ - ((type) == USRQUOTA ? (sb_dqopt(sb)->flags & DQUOT_USR_SUSPENDED) : \ - (sb_dqopt(sb)->flags & DQUOT_GRP_SUSPENDED)) - -#define sb_any_quota_suspended (sb) (sb_has_quota_suspended(sb, USRQUOTA) | \ - sb_has_quota_suspended(sb, GRPQUOTA)) -int register_quota_format (struct quota_format_type *fmt);void unregister_quota_format (struct quota_format_type *fmt);
include/linux/quotaops.h +25 -0
@@ -52,6 +52,26 @@ void vfs_dq_drop(struct inode *inode);int vfs_dq_transfer (struct inode *inode,struct iattr *iattr);int vfs_dq_quota_on_remount (struct super_block *sb); +#define sb_dqopt (sb) (&(sb)->s_dquot) +#define sb_dqinfo (sb, type) (sb_dqopt(sb)->info+(type)) + +/* +* Functions for checking status of quota +*/ + +#define sb_has_quota_enabled (sb, type) ((type)==USRQUOTA ? \ + (sb_dqopt(sb)->flags & DQUOT_USR_ENABLED) : (sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED)) + +#define sb_any_quota_enabled (sb) (sb_has_quota_enabled(sb, USRQUOTA) | \ + sb_has_quota_enabled(sb, GRPQUOTA)) + +#define sb_has_quota_suspended (sb, type) \ + ((type) == USRQUOTA ? (sb_dqopt(sb)->flags & DQUOT_USR_SUSPENDED) : \ + (sb_dqopt(sb)->flags & DQUOT_GRP_SUSPENDED)) + +#define sb_any_quota_suspended (sb) (sb_has_quota_suspended(sb, USRQUOTA) | \ + sb_has_quota_suspended(sb, GRPQUOTA)) +/* * Operations supported for diskquotas. */
@@ -159,6 +179,11 @@ static inline int vfs_dq_off(struct super_block *sb, int remount)#else +#define sb_has_quota_enabled (sb, type) 0 +#define sb_any_quota_enabled (sb) 0 +#define sb_has_quota_suspended (sb, type) 0 +#define sb_any_quota_suspended (sb) 0 +/* * NO-OP when quota not configured. */
Signature · 1 line
1.5.2.4
Jan Kara
reviewerRe: [PATCH 2/2] quota: Convert macros to inline functions
In reply to Jan Kara--- include/linux/quota.h | 5 +++- include/linux/quotaops.h | 65 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 54 insertions(+), 16 deletions(-)
include/linux/quota.h +4 -1
@@ -223,7 +223,10 @@ struct super_block;#define DQF_INFO_DIRTY (1 << DQF_INFO_DIRTY_B)/* Is info dirty? */ extern void mark_info_dirty (struct super_block *sb,int type); -#define info_dirty (info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags) +static inline int info_dirty (struct mem_dqinfo *info) +{ +return test_bit (DQF_INFO_DIRTY_B , &info->dqi_flags); +}struct dqstats {int lookups;
include/linux/quotaops.h +50 -15
85 lines not on this page · raw message
Signature · 1 line
1.5.2.4