Merge quota update

3 files changed, 23 insertions, 101 deletions

diff --git a/include/linux/quota.h b/include/linux/quota.h
index 1a9d178c57bc..bdaca4b90592 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -184,22 +184,18 @@ extern inline void mark_info_dirty(struct mem_dqinfo *info)
 
 #define sb_dqopt(sb) (&(sb)->s_dquot)
 
-/*
- * Statistics about disc quota.
- */
-enum {
-	DQSTATS_LOOKUPS,
-	DQSTATS_DROPS,
-	DQSTATS_READS,
-	DQSTATS_WRITES,
-	DQSTATS_CACHE_HITS,
-	DQSTATS_ALLOCATED,
-	DQSTATS_FREE,
-	DQSTATS_SYNCS,
-	DQSTATS_SIZE
+struct dqstats {
+	int lookups;
+	int drops;
+	int reads;
+	int writes;
+	int cache_hits;
+	int allocated_dquots;
+	int free_dquots;
+	int syncs;
 };
 
-extern __u32 dqstats_array[DQSTATS_SIZE];
+extern struct dqstats dqstats;
 
 #define NR_DQHASH 43            /* Just an arbitrary number */
 
diff --git a/include/linux/quotacompat.h b/include/linux/quotacompat.h
deleted file mode 100644
index 484aac17efc9..000000000000
--- a/include/linux/quotacompat.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *	Definition of symbols used for backward compatible interface
- */
-
-#ifndef _LINUX_QUOTACOMPAT_
-#define _LINUX_QUOTACOMPAT_
-
-#include <linux/types.h>
-#include <linux/quota.h>
-
-struct v1c_mem_dqblk {
-	__u32 dqb_bhardlimit;	/* absolute limit on disk blks alloc */
-	__u32 dqb_bsoftlimit;	/* preferred limit on disk blks */
-	__u32 dqb_curblocks;	/* current block count */
-	__u32 dqb_ihardlimit;	/* maximum # allocated inodes */
-	__u32 dqb_isoftlimit;	/* preferred inode limit */
-	__u32 dqb_curinodes;	/* current # allocated inodes */
-	time_t dqb_btime;	/* time limit for excessive disk use */
-	time_t dqb_itime;	/* time limit for excessive files */
-};
-
-struct v1c_dqstats {
-	__u32 lookups;
-	__u32 drops;
-	__u32 reads;
-	__u32 writes;
-	__u32 cache_hits;
-	__u32 allocated_dquots;
-	__u32 free_dquots;
-	__u32 syncs;
-};
-
-struct v2c_mem_dqblk {
-	unsigned int dqb_ihardlimit;
-	unsigned int dqb_isoftlimit;
-	unsigned int dqb_curinodes;
-	unsigned int dqb_bhardlimit;
-	unsigned int dqb_bsoftlimit;
-	qsize_t dqb_curspace;
-	__kernel_time_t dqb_btime;
-	__kernel_time_t dqb_itime;
-};
-
-struct v2c_mem_dqinfo {
-	unsigned int dqi_bgrace;
-	unsigned int dqi_igrace;
-	unsigned int dqi_flags;
-	unsigned int dqi_blocks;
-	unsigned int dqi_free_blk;
-	unsigned int dqi_free_entry;
-};
-
-struct v2c_dqstats {
-	__u32 lookups;
-	__u32 drops;
-	__u32 reads;
-	__u32 writes;
-	__u32 cache_hits;
-	__u32 allocated_dquots;
-	__u32 free_dquots;
-	__u32 syncs;
-	__u32 version;
-};
-
-#define Q_COMP_QUOTAON  0x0100	/* enable quotas */
-#define Q_COMP_QUOTAOFF 0x0200	/* disable quotas */
-#define Q_COMP_SYNC     0x0600	/* sync disk copy of a filesystems quotas */
-
-#define Q_V1_GETQUOTA 0x0300	/* get limits and usage */
-#define Q_V1_SETQUOTA 0x0400	/* set limits and usage */
-#define Q_V1_SETUSE   0x0500	/* set usage */
-#define Q_V1_SETQLIM  0x0700	/* set limits */
-#define Q_V1_GETSTATS 0x0800	/* get collected stats */
-#define Q_V1_RSQUASH  0x1000	/* set root_squash option */
-
-#define Q_V2_SETQLIM  0x0700	/* set limits */
-#define Q_V2_GETINFO  0x0900	/* get info about quotas - graces, flags... */
-#define Q_V2_SETINFO  0x0A00	/* set info about quotas */
-#define Q_V2_SETGRACE 0x0B00	/* set inode and block grace */
-#define Q_V2_SETFLAGS 0x0C00	/* set flags for quota */
-#define Q_V2_GETQUOTA 0x0D00	/* get limits and usage */
-#define Q_V2_SETQUOTA 0x0E00	/* set limits and usage */
-#define Q_V2_SETUSE   0x0F00	/* set usage */
-#define Q_V2_GETSTATS 0x1100	/* get collected stats */
-
-#endif
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 373d20b4c4a7..a5a6684f9a50 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -544,7 +544,19 @@ enum
 	FS_LEASES=13,	/* int: leases enabled */
 	FS_DIR_NOTIFY=14,	/* int: directory notification enabled */
 	FS_LEASE_TIME=15,	/* int: maximum time to wait for a lease break */
-	FS_DQSTATS=16,	/* int: disc quota suage statistics */
+	FS_DQSTATS=16,	/* disc quota usage statistics */
+};
+
+/* /proc/sys/fs/quota/ */
+enum {
+	FS_DQ_LOOKUPS = 1,
+	FS_DQ_DROPS = 2,
+	FS_DQ_READS = 3,
+	FS_DQ_WRITES = 4,
+	FS_DQ_CACHE_HITS = 5,
+	FS_DQ_ALLOCATED = 6,
+	FS_DQ_FREE = 7,
+	FS_DQ_SYNCS = 8,
 };
 
 /* CTL_DEBUG names: */