mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
1c1d9793ff
commit
4539f1df25
|
@ -50,7 +50,6 @@ struct ocfs2_mem_dqinfo {
|
|||
unsigned int dqi_chunks; /* Number of chunks in local quota file */
|
||||
unsigned int dqi_blocks; /* Number of blocks allocated for local quota file */
|
||||
unsigned int dqi_syncms; /* How often should we sync with other nodes */
|
||||
unsigned int dqi_syncjiff; /* Precomputed dqi_syncms in jiffies */
|
||||
struct list_head dqi_chunk; /* List of chunks */
|
||||
struct inode *dqi_gqinode; /* Global quota file inode */
|
||||
struct ocfs2_lock_res dqi_gqlock; /* Lock protecting quota information structure */
|
||||
|
|
|
@ -346,7 +346,6 @@ int ocfs2_global_read_info(struct super_block *sb, int type)
|
|||
info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
|
||||
info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
|
||||
oinfo->dqi_syncms = le32_to_cpu(dinfo.dqi_syncms);
|
||||
oinfo->dqi_syncjiff = msecs_to_jiffies(oinfo->dqi_syncms);
|
||||
oinfo->dqi_gi.dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);
|
||||
oinfo->dqi_gi.dqi_free_blk = le32_to_cpu(dinfo.dqi_free_blk);
|
||||
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)
|
|||
oinfo->dqi_gi.dqi_qtree_depth = qtree_depth(&oinfo->dqi_gi);
|
||||
INIT_DELAYED_WORK(&oinfo->dqi_sync_work, qsync_work_fn);
|
||||
queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work,
|
||||
oinfo->dqi_syncjiff);
|
||||
msecs_to_jiffies(oinfo->dqi_syncms));
|
||||
|
||||
out_err:
|
||||
mlog_exit(status);
|
||||
|
@ -611,7 +610,7 @@ static void qsync_work_fn(struct work_struct *work)
|
|||
|
||||
dquot_scan_active(sb, ocfs2_sync_dquot_helper, oinfo->dqi_type);
|
||||
queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work,
|
||||
oinfo->dqi_syncjiff);
|
||||
msecs_to_jiffies(oinfo->dqi_syncms));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue