All of lore.kernel.org
 help / color / mirror / Atom feed
* [Ocfs2-devel] [PATCH] ocfs2: cleanup some return variables
@ 2022-01-14  2:16 Joseph Qi via Ocfs2-devel
  2022-01-21  1:46 ` Joseph Qi via Ocfs2-devel
  0 siblings, 1 reply; 2+ messages in thread
From: Joseph Qi via Ocfs2-devel @ 2022-01-14  2:16 UTC (permalink / raw)
  To: akpm, ocfs2-devel; +Cc: Minghao Chi, CGEL ZTE

Simply return directly instead of assign the return value to another
variable.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Cc: Minghao Chi <chi.minghao@zte.com.cn>
Cc: CGEL ZTE <cgel.zte@gmail.com>
Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
---
 fs/ocfs2/file.c       |  9 +++------
 fs/ocfs2/stack_user.c | 18 ++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index fc5f780fa235..24321c44cd42 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -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,
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index 85a47621e0c0..a75e2b7d67f5 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -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)
-- 
2.19.1.6.gb485710b


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Ocfs2-devel] [PATCH] ocfs2: cleanup some return variables
  2022-01-14  2:16 [Ocfs2-devel] [PATCH] ocfs2: cleanup some return variables Joseph Qi via Ocfs2-devel
@ 2022-01-21  1:46 ` Joseph Qi via Ocfs2-devel
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi via Ocfs2-devel @ 2022-01-21  1:46 UTC (permalink / raw)
  To: akpm, ocfs2-devel; +Cc: CGEL ZTE, Minghao Chi

Hi Andrew,
Could you please consider add this to -mm tree?

Thanks,
Joseph

On 1/14/22 10:16 AM, Joseph Qi wrote:
> Simply return directly instead of assign the return value to another
> variable.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Cc: Minghao Chi <chi.minghao@zte.com.cn>
> Cc: CGEL ZTE <cgel.zte@gmail.com>
> Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
>  fs/ocfs2/file.c       |  9 +++------
>  fs/ocfs2/stack_user.c | 18 ++++++------------
>  2 files changed, 9 insertions(+), 18 deletions(-)
> 
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index fc5f780fa235..24321c44cd42 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -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,
> diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
> index 85a47621e0c0..a75e2b7d67f5 100644
> --- a/fs/ocfs2/stack_user.c
> +++ b/fs/ocfs2/stack_user.c
> @@ -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)

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-01-21  1:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-14  2:16 [Ocfs2-devel] [PATCH] ocfs2: cleanup some return variables Joseph Qi via Ocfs2-devel
2022-01-21  1:46 ` Joseph Qi via Ocfs2-devel

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.