ocfs2: Add const to various occurrences of struct ocfs2_lock_res_ops
PATCH 1/1 ocfs2: Add const to various occurrences of struct ocfs2_lock_res_ops
The field l_ops of structure ocfs2_lock_res can be made const as it never modified after getting initialized. After making this change the parameter struct ocfs2_lock_res_ops *ops of function ocfs2_lock_res_init_common can be made const as ops is only stored in l_ops. Now the structures of type ocfs2_lock_res_ops can be made const as they are only passed as an argument to the above updated function.
Signed-off-by Bhumika Goyal <[email protected]>
--- fs/ocfs2/dlmglue.c | 26 +++++++++++++------------- fs/ocfs2/ocfs2.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-)
fs/ocfs2/dlmglue.c +13 -13
@@ -233,12 +233,12 @@ struct ocfs2_lock_res_ops {*/ #define LOCK_TYPE_USES_LVB 0x2 -static struct ocfs2_lock_res_ops ocfs2_inode_rw_lops = { +static const struct ocfs2_lock_res_ops ocfs2_inode_rw_lops = { .get_osb = ocfs2_get_inode_osb, .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_inode_inode_lops = { +static const struct ocfs2_lock_res_ops ocfs2_inode_inode_lops = { .get_osb = ocfs2_get_inode_osb, .check_downconvert = ocfs2_check_meta_downconvert, .set_lvb = ocfs2_set_meta_lvb,
@@ -246,46 +246,46 @@ struct ocfs2_lock_res_ops { .flags = LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB, }; -static struct ocfs2_lock_res_ops ocfs2_super_lops = { +static const struct ocfs2_lock_res_ops ocfs2_super_lops = { .flags =LOCK_TYPE_REQUIRES_REFRESH , }; -static struct ocfs2_lock_res_ops ocfs2_rename_lops = { +static const struct ocfs2_lock_res_ops ocfs2_rename_lops = { .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_nfs_sync_lops = { +static const struct ocfs2_lock_res_ops ocfs2_nfs_sync_lops = { .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_orphan_scan_lops = { +static const struct ocfs2_lock_res_ops ocfs2_orphan_scan_lops = { .flags =LOCK_TYPE_REQUIRES_REFRESH |LOCK_TYPE_USES_LVB , }; -static struct ocfs2_lock_res_ops ocfs2_dentry_lops = { +static const struct ocfs2_lock_res_ops ocfs2_dentry_lops = { .get_osb = ocfs2_get_dentry_osb, .post_unlock = ocfs2_dentry_post_unlock, .downconvert_worker = ocfs2_dentry_convert_worker, .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_inode_open_lops = { +static const struct ocfs2_lock_res_ops ocfs2_inode_open_lops = { .get_osb = ocfs2_get_inode_osb, .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_flock_lops = { +static const struct ocfs2_lock_res_ops ocfs2_flock_lops = { .get_osb = ocfs2_get_file_osb, .flags =0 , }; -static struct ocfs2_lock_res_ops ocfs2_qinfo_lops = { +static const struct ocfs2_lock_res_ops ocfs2_qinfo_lops = { .set_lvb = ocfs2_set_qinfo_lvb, .get_osb = ocfs2_get_qinfo_osb, .flags =LOCK_TYPE_REQUIRES_REFRESH |LOCK_TYPE_USES_LVB , }; -static struct ocfs2_lock_res_ops ocfs2_refcount_block_lops = { +static const struct ocfs2_lock_res_ops ocfs2_refcount_block_lops = { .check_downconvert = ocfs2_check_refcount_downconvert, .downconvert_worker = ocfs2_refcount_convert_worker, .flags =0 ,
@@ -497,7 +497,7 @@ static inline void ocfs2_init_start_time(struct ocfs2_mask_waiter *mw)static void ocfs2_lock_res_init_common (struct ocfs2_super *osb,struct ocfs2_lock_res *res,enum ocfs2_lock_type type, -struct ocfs2_lock_res_ops *ops, +const struct ocfs2_lock_res_ops *ops,void *priv) { res->l_type = type;
@@ -539,7 +539,7 @@ void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res,unsigned int generation, struct inode *inode) { - struct ocfs2_lock_res_ops *ops; + const struct ocfs2_lock_res_ops *ops;switch (type) {case OCFS2_LOCK_TYPE_RW :
fs/ocfs2/ocfs2.h +1 -1
@@ -167,7 +167,7 @@ struct ocfs2_lock_stats {struct ocfs2_lock_res {void *l_priv; -struct ocfs2_lock_res_ops *l_ops; +const struct ocfs2_lock_res_ops *l_ops;struct list_head l_blocked_list;
Signature · 1 line
1.9.1