aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-12-07 01:28:35 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2009-12-07 01:29:22 -0500
commit6548698f929814375fa5d62ae1db96959b0418c1 (patch)
tree340924ae82cb0946aa15045b2b72186de52a8146 /fs/reiserfs
parent1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75 (diff)
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date with 2.6.32. Although no conflicting changes were made in between, it gives benchmarking results closer to the lastest kernel behaviour.
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 58727b5b4351..339b0baf2af6 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -615,7 +615,7 @@ static int reiserfs_mark_dquot_dirty(struct dquot *);
615static int reiserfs_write_info(struct super_block *, int); 615static int reiserfs_write_info(struct super_block *, int);
616static int reiserfs_quota_on(struct super_block *, int, int, char *, int); 616static int reiserfs_quota_on(struct super_block *, int, int, char *, int);
617 617
618static struct dquot_operations reiserfs_quota_operations = { 618static const struct dquot_operations reiserfs_quota_operations = {
619 .initialize = dquot_initialize, 619 .initialize = dquot_initialize,
620 .drop = dquot_drop, 620 .drop = dquot_drop,
621 .alloc_space = dquot_alloc_space, 621 .alloc_space = dquot_alloc_space,
@@ -632,7 +632,7 @@ static struct dquot_operations reiserfs_quota_operations = {
632 .destroy_dquot = dquot_destroy, 632 .destroy_dquot = dquot_destroy,
633}; 633};
634 634
635static struct quotactl_ops reiserfs_qctl_operations = { 635static const struct quotactl_ops reiserfs_qctl_operations = {
636 .quota_on = reiserfs_quota_on, 636 .quota_on = reiserfs_quota_on,
637 .quota_off = vfs_quota_off, 637 .quota_off = vfs_quota_off,
638 .quota_sync = vfs_quota_sync, 638 .quota_sync = vfs_quota_sync,