From 9e7341f01d441cdb1376c3ac51e605441eb2d494 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 16 Oct 2009 15:26:03 +0400
Subject: [PATCH] --- yaml --- r: 175291 b: refs/heads/master c:
 1472da5fdc65f0cd286c655758d629346001e126 h: refs/heads/master i:   175289:
 51e236cad8b43b50cc39b79d5239d29668fcf72a   175287:
 bb290a6bc3df367c640b122299efb9ed15ffa880 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ocfs2/quota_local.c | 2 +-
 trunk/fs/quota/quota_v1.c    | 2 +-
 trunk/fs/quota/quota_v2.c    | 2 +-
 trunk/include/linux/quota.h  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a8eaa7c69a0e..82e11bcc2eb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ced58f73554e9d9609a790c5164d10ef91ce8ff
+refs/heads/master: 1472da5fdc65f0cd286c655758d629346001e126
diff --git a/trunk/fs/ocfs2/quota_local.c b/trunk/fs/ocfs2/quota_local.c
index 1a2c50a759fa..21f9e71223ca 100644
--- a/trunk/fs/ocfs2/quota_local.c
+++ b/trunk/fs/ocfs2/quota_local.c
@@ -1325,7 +1325,7 @@ static int ocfs2_local_release_dquot(struct dquot *dquot)
 	return status;
 }
 
-static struct quota_format_ops ocfs2_format_ops = {
+static const struct quota_format_ops ocfs2_format_ops = {
 	.check_quota_file	= ocfs2_local_check_quota_file,
 	.read_file_info		= ocfs2_local_read_info,
 	.write_file_info	= ocfs2_global_write_info,
diff --git a/trunk/fs/quota/quota_v1.c b/trunk/fs/quota/quota_v1.c
index 0edcf42b1778..2ae757e9c008 100644
--- a/trunk/fs/quota/quota_v1.c
+++ b/trunk/fs/quota/quota_v1.c
@@ -204,7 +204,7 @@ static int v1_write_file_info(struct super_block *sb, int type)
 	return ret;
 }
 
-static struct quota_format_ops v1_format_ops = {
+static const struct quota_format_ops v1_format_ops = {
 	.check_quota_file	= v1_check_quota_file,
 	.read_file_info		= v1_read_file_info,
 	.write_file_info	= v1_write_file_info,
diff --git a/trunk/fs/quota/quota_v2.c b/trunk/fs/quota/quota_v2.c
index a5475fb1ae44..01f25eae684d 100644
--- a/trunk/fs/quota/quota_v2.c
+++ b/trunk/fs/quota/quota_v2.c
@@ -207,7 +207,7 @@ static int v2_free_file_info(struct super_block *sb, int type)
 	return 0;
 }
 
-static struct quota_format_ops v2_format_ops = {
+static const struct quota_format_ops v2_format_ops = {
 	.check_quota_file	= v2_check_quota_file,
 	.read_file_info		= v2_read_file_info,
 	.write_file_info	= v2_write_file_info,
diff --git a/trunk/include/linux/quota.h b/trunk/include/linux/quota.h
index ce9a9b2e5cd4..f63c9d6ba784 100644
--- a/trunk/include/linux/quota.h
+++ b/trunk/include/linux/quota.h
@@ -334,7 +334,7 @@ struct quotactl_ops {
 
 struct quota_format_type {
 	int qf_fmt_id;	/* Quota format id */
-	struct quota_format_ops *qf_ops;	/* Operations of format */
+	const struct quota_format_ops *qf_ops;	/* Operations of format */
 	struct module *qf_owner;		/* Module implementing quota format */
 	struct quota_format_type *qf_next;
 };
@@ -394,7 +394,7 @@ struct quota_info {
 	struct rw_semaphore dqptr_sem;		/* serialize ops using quota_info struct, pointers from inode to dquots */
 	struct inode *files[MAXQUOTAS];		/* inodes of quotafiles */
 	struct mem_dqinfo info[MAXQUOTAS];	/* Information for each quota type */
-	struct quota_format_ops *ops[MAXQUOTAS];	/* Operations for each type */
+	const struct quota_format_ops *ops[MAXQUOTAS];	/* Operations for each type */
 };
 
 int register_quota_format(struct quota_format_type *fmt);