ocfs2: cleanup some return variables
PATCH 1/1 ocfs2: cleanup some return variables
Simply return directly instead of assign the return value to another variable.
Reported-by Zeal Robot <[email protected]>
Cc Minghao Chi <[email protected]>
Cc CGEL ZTE <[email protected]>
Signed-off-by Joseph Qi <[email protected]>
--- fs/ocfs2/file.c | 9 +++------ fs/ocfs2/stack_user.c | 18 ++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-)
fs/ocfs2/file.c +3 -6
@@ -540,15 +540,12 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,struct ocfs2_alloc_context *meta_ac, enum ocfs2_alloc_restarted *reason_ret) { - int ret; struct ocfs2_extent_tree et;ocfs2_init_dinode_extent_tree (&et,INODE_CACHE (inode), fe_bh); - ret =ocfs2_add_clusters_in_btree (handle, &et, logical_offset, - clusters_to_add, mark_unwritten, - data_ac, meta_ac, reason_ret); - -return ret; +return ocfs2_add_clusters_in_btree (handle, &et, logical_offset, + clusters_to_add, mark_unwritten, + data_ac, meta_ac, reason_ret); } static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
fs/ocfs2/stack_user.c +6 -12
@@ -683,28 +683,22 @@ static int user_dlm_lock(struct ocfs2_cluster_connection *conn, void *name, unsigned int namelen) { - int ret; -if (!lksb->lksb_fsdlm.sb_lvbptr) lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +sizeof (struct dlm_lksb ); - ret =dlm_lock (conn->cc_lockspace, mode, &lksb->lksb_fsdlm, - flags|DLM_LKF_NODLCKWT , name, namelen,0 , - fsdlm_lock_ast_wrapper, lksb, - fsdlm_blocking_ast_wrapper); -return ret; +return dlm_lock (conn->cc_lockspace, mode, &lksb->lksb_fsdlm, + flags|DLM_LKF_NODLCKWT , name, namelen,0 , + fsdlm_lock_ast_wrapper, lksb, + fsdlm_blocking_ast_wrapper); }static int user_dlm_unlock (struct ocfs2_cluster_connection *conn,struct ocfs2_dlm_lksb *lksb,u32 flags) { -int ret; - - ret =dlm_unlock (conn->cc_lockspace, lksb->lksb_fsdlm.sb_lkid, - flags, &lksb->lksb_fsdlm, lksb); -return ret; +return dlm_unlock (conn->cc_lockspace, lksb->lksb_fsdlm.sb_lkid, + flags, &lksb->lksb_fsdlm, lksb); }static int user_dlm_lock_status (struct ocfs2_dlm_lksb *lksb)
Signature · 7 lines
2.19.1.6.gb485710b _______________________________________________ Ocfs2-devel mailing list [email protected] https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Hi Andrew,
Could you please consider add this to -mm tree?
Thanks,
Joseph
Quoted 64 lines · Joseph Qi
Simply return directly instead of assign the return value to another variable.
Reported-by Zeal Robot <[email protected]>Cc Minghao Chi <[email protected]>Cc CGEL ZTE <[email protected]>Signed-off-by Joseph Qi <[email protected]>--- fs/ocfs2/file.c | 9 +++------ fs/ocfs2/stack_user.c | 18 ++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-)fs/ocfs2/file.c +3
-6@@ -540,15 +540,12 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,struct ocfs2_alloc_context *meta_ac, enum ocfs2_alloc_restarted *reason_ret) { - int ret; struct ocfs2_extent_tree et;ocfs2_init_dinode_extent_tree (&et,INODE_CACHE (inode), fe_bh); - ret =ocfs2_add_clusters_in_btree (handle, &et, logical_offset, - clusters_to_add, mark_unwritten, - data_ac, meta_ac, reason_ret); - -return ret; +return ocfs2_add_clusters_in_btree (handle, &et, logical_offset, + clusters_to_add, mark_unwritten, + data_ac, meta_ac, reason_ret); } static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,fs/ocfs2/stack_user.c +4
-7@@ -683,28 +683,22 @@ static int user_dlm_lock(struct ocfs2_cluster_connection *conn, void *name, unsigned int namelen) { - int ret; -if (!lksb->lksb_fsdlm.sb_lvbptr) lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +sizeof (struct dlm_lksb ); - ret =dlm_lock (conn->cc_lockspace, mode, &lksb->lksb_fsdlm, - flags|DLM_LKF_NODLCKWT , name, namelen,0 , - fsdlm_lock_ast_wrapper, lksb, - fsdlm_blocking_ast_wrapper); -return ret; +return dlm_lock (conn->cc_lockspace, mode, &lksb->lksb_fsdlm, + flags|DLM_LKF_NODLCKWT , name, namelen,0 , + fsdlm_lock_ast_wrapper, lksb, + fsdlm_blocking_ast_wrapper); }static int user_dlm_unlock (struct ocfs2_cluster_connection *conn,struct ocfs2_dlm_lksb *lksb,u32 flags) {
fs/ocfs2/stack_user.c static int user_dlm_lock(struct ocfs2_cluster_connection *conn, · line 704
Quoted 10 lines
fs/ocfs2/stack_user.c +2
-5-int ret; - - ret =dlm_unlock (conn->cc_lockspace, lksb->lksb_fsdlm.sb_lkid, - flags, &lksb->lksb_fsdlm, lksb); -return ret; +return dlm_unlock (conn->cc_lockspace, lksb->lksb_fsdlm.sb_lkid, + flags, &lksb->lksb_fsdlm, lksb); }static int user_dlm_lock_status (struct ocfs2_dlm_lksb *lksb)
_______________________________________________
Ocfs2-devel mailing list
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel