aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/quota_global.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2009-07-22 07:17:20 -0400
committerJoel Becker <joel.becker@oracle.com>2009-07-23 13:59:27 -0400
commit4539f1df25bcd0fdf0d8a5e2c92de6bece83c7a0 (patch)
treefb3a2429f8759816fd15877ec0c0ab3c567dbb51 /fs/ocfs2/quota_global.c
parent1c1d9793ff6720531c0125a28d321f283716e32f (diff)
ocfs2: Remove syncjiff field from quota info
syncjiff is just a converted value of syncms. Some places which are updating syncms forgot to update syncjiff as well. Since the conversion is just a simple division / multiplication and it does not happen frequently, just remove the syncjiff field to avoid forgotten conversions. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/quota_global.c')
-rw-r--r--fs/ocfs2/quota_global.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 7248db681351..dab45467b5fd 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -346,7 +346,6 @@ int ocfs2_global_read_info(struct super_block *sb, int type)
346 info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace); 346 info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
347 info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace); 347 info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
348 oinfo->dqi_syncms = le32_to_cpu(dinfo.dqi_syncms); 348 oinfo->dqi_syncms = le32_to_cpu(dinfo.dqi_syncms);
349 oinfo->dqi_syncjiff = msecs_to_jiffies(oinfo->dqi_syncms);
350 oinfo->dqi_gi.dqi_blocks = le32_to_cpu(dinfo.dqi_blocks); 349 oinfo->dqi_gi.dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);
351 oinfo->dqi_gi.dqi_free_blk = le32_to_cpu(dinfo.dqi_free_blk); 350 oinfo->dqi_gi.dqi_free_blk = le32_to_cpu(dinfo.dqi_free_blk);
352 oinfo->dqi_gi.dqi_free_entry = le32_to_cpu(dinfo.dqi_free_entry); 351 oinfo->dqi_gi.dqi_free_entry = le32_to_cpu(dinfo.dqi_free_entry);
@@ -356,7 +355,7 @@ int ocfs2_global_read_info(struct super_block *sb, int type)
356 oinfo->dqi_gi.dqi_qtree_depth = qtree_depth(&oinfo->dqi_gi); 355 oinfo->dqi_gi.dqi_qtree_depth = qtree_depth(&oinfo->dqi_gi);
357 INIT_DELAYED_WORK(&oinfo->dqi_sync_work, qsync_work_fn); 356 INIT_DELAYED_WORK(&oinfo->dqi_sync_work, qsync_work_fn);
358 queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work, 357 queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work,
359 oinfo->dqi_syncjiff); 358 msecs_to_jiffies(oinfo->dqi_syncms));
360 359
361out_err: 360out_err:
362 mlog_exit(status); 361 mlog_exit(status);
@@ -611,7 +610,7 @@ static void qsync_work_fn(struct work_struct *work)
611 610
612 dquot_scan_active(sb, ocfs2_sync_dquot_helper, oinfo->dqi_type); 611 dquot_scan_active(sb, ocfs2_sync_dquot_helper, oinfo->dqi_type);
613 queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work, 612 queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work,
614 oinfo->dqi_syncjiff); 613 msecs_to_jiffies(oinfo->dqi_syncms));
615} 614}
616 615
617/* 616/*