[14/16] xfs: xlog_write() no longer needs contwr state

Message ID	20211118231352.2051947-15-david@fromorbit.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: Dave Chinner <david@fromorbit.com> To: linux-xfs@vger.kernel.org Subject: [PATCH 14/16] xfs: xlog_write() no longer needs contwr state Date: Fri, 19 Nov 2021 10:13:50 +1100 Message-Id: <20211118231352.2051947-15-david@fromorbit.com> In-Reply-To: <20211118231352.2051947-1-david@fromorbit.com> References: <20211118231352.2051947-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	xfs: rework xlog_write() \| expand [00/16,v7] xfs: rework xlog_write() [01/16] xfs: factor out the CIL transaction header building [02/16] xfs: only CIL pushes require a start record [03/16] xfs: embed the xlog_op_header in the unmount record [04/16] xfs: embed the xlog_op_header in the commit record [05/16] xfs: log tickets don't need log client id [06/16] xfs: move log iovec alignment to preparation function [07/16] xfs: reserve space and initialise xlog_op_header in item formatting [08/16] xfs: log ticket region debug is largely useless [09/16] xfs: pass lv chain length into xlog_write() [10/16] xfs: change the type of ic_datap [11/16] xfs: introduce xlog_write_full() [12/16] xfs: introduce xlog_write_partial() [13/16] xfs: remove xlog_verify_dest_ptr [14/16] xfs: xlog_write() no longer needs contwr state [15/16] xfs: xlog_write() doesn't need optype anymore [16/16] xfs: CIL context doesn't need to count iovecs

Message ID

20211118231352.2051947-15-david@fromorbit.com (mailing list archive)

State

New, archived

Headers

From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 14/16] xfs: xlog_write() no longer needs contwr state
Date: Fri, 19 Nov 2021 10:13:50 +1100
Message-Id: <20211118231352.2051947-15-david@fromorbit.com>
In-Reply-To: <20211118231352.2051947-1-david@fromorbit.com>
References: <20211118231352.2051947-1-david@fromorbit.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

xfs: rework xlog_write() | expand

Commit Message

Dave Chinner Nov. 18, 2021, 11:13 p.m. UTC

From: Dave Chinner <dchinner@redhat.com>

The rework of xlog_write() no longer requires xlog_get_iclog_state()
to tell it about internal iclog space reservation state to direct it
on what to do. Remove this parameter.

$ size fs/xfs/xfs_log.o.*
   text	   data	    bss	    dec	    hex	filename
  26520	    560	      8	  27088	   69d0	fs/xfs/xfs_log.o.orig
  26384	    560	      8	  26952	   6948	fs/xfs/xfs_log.o.patched

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_log.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

Comments

Chandan Babu R Nov. 24, 2021, 8:54 a.m. UTC | #1

On 19 Nov 2021 at 04:43, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The rework of xlog_write() no longer requires xlog_get_iclog_state()
> to tell it about internal iclog space reservation state to direct it
> on what to do. Remove this parameter.
>
> $ size fs/xfs/xfs_log.o.*
>    text	   data	    bss	    dec	    hex	filename
>   26520	    560	      8	  27088	   69d0	fs/xfs/xfs_log.o.orig
>   26384	    560	      8	  26952	   6948	fs/xfs/xfs_log.o.patched
>

Looks good.

Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>

> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_log.c | 28 ++++++++++------------------
>  1 file changed, 10 insertions(+), 18 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index ca8a9313d9c5..da660e09aa5c 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -49,7 +49,6 @@ xlog_state_get_iclog_space(
>  	int			len,
>  	struct xlog_in_core	**iclog,
>  	struct xlog_ticket	*ticket,
> -	int			*continued_write,
>  	int			*logoffsetp);
>  STATIC void
>  xlog_grant_push_ail(
> @@ -2277,8 +2276,7 @@ xlog_write_get_more_iclog_space(
>  	uint32_t		*log_offset,
>  	uint32_t		len,
>  	uint32_t		*record_cnt,
> -	uint32_t		*data_cnt,
> -	int			*contwr)
> +	uint32_t		*data_cnt)
>  {
>  	struct xlog_in_core	*iclog = *iclogp;
>  	struct xlog		*log = iclog->ic_log;
> @@ -2292,8 +2290,8 @@ xlog_write_get_more_iclog_space(
>  	if (error)
>  		return error;
>  
> -	error = xlog_state_get_iclog_space(log, len, &iclog,
> -				ticket, contwr, log_offset);
> +	error = xlog_state_get_iclog_space(log, len, &iclog, ticket,
> +					log_offset);
>  	if (error)
>  		return error;
>  	*record_cnt = 0;
> @@ -2316,8 +2314,7 @@ xlog_write_partial(
>  	uint32_t		*log_offset,
>  	uint32_t		*len,
>  	uint32_t		*record_cnt,
> -	uint32_t		*data_cnt,
> -	int			*contwr)
> +	uint32_t		*data_cnt)
>  {
>  	struct xlog_in_core	*iclog = *iclogp;
>  	struct xlog_op_header	*ophdr;
> @@ -2345,7 +2342,7 @@ xlog_write_partial(
>  					sizeof(struct xlog_op_header)) {
>  			error = xlog_write_get_more_iclog_space(ticket,
>  					&iclog, log_offset, *len, record_cnt,
> -					data_cnt, contwr);
> +					data_cnt);
>  			if (error)
>  				return error;
>  		}
> @@ -2397,7 +2394,7 @@ xlog_write_partial(
>  			error = xlog_write_get_more_iclog_space(ticket,
>  					&iclog, log_offset,
>  					*len + sizeof(struct xlog_op_header),
> -					record_cnt, data_cnt, contwr);
> +					record_cnt, data_cnt);
>  			if (error)
>  				return error;
>  
> @@ -2492,7 +2489,6 @@ xlog_write(
>  {
>  	struct xlog_in_core	*iclog = NULL;
>  	struct xfs_log_vec	*lv = log_vector;
> -	int			contwr = 0;
>  	uint32_t		record_cnt = 0;
>  	uint32_t		data_cnt = 0;
>  	int			error = 0;
> @@ -2506,7 +2502,7 @@ xlog_write(
>  	}
>  
>  	error = xlog_state_get_iclog_space(log, len, &iclog, ticket,
> -					   &contwr, &log_offset);
> +					   &log_offset);
>  	if (error)
>  		return error;
>  
> @@ -2529,7 +2525,7 @@ xlog_write(
>  		    lv->lv_bytes > iclog->ic_size - log_offset) {
>  			error = xlog_write_partial(lv, ticket, &iclog,
>  					&log_offset, &len, &record_cnt,
> -					&data_cnt, &contwr);
> +					&data_cnt);
>  			if (error) {
>  				/*
>  				 * We have no iclog to release, so just return
> @@ -2909,7 +2905,6 @@ xlog_state_get_iclog_space(
>  	int			len,
>  	struct xlog_in_core	**iclogp,
>  	struct xlog_ticket	*ticket,
> -	int			*continued_write,
>  	int			*logoffsetp)
>  {
>  	int		  log_offset;
> @@ -2987,13 +2982,10 @@ xlog_state_get_iclog_space(
>  	 * iclogs (to mark it taken), this particular iclog will release/sync
>  	 * to disk in xlog_write().
>  	 */
> -	if (len <= iclog->ic_size - iclog->ic_offset) {
> -		*continued_write = 0;
> +	if (len <= iclog->ic_size - iclog->ic_offset)
>  		iclog->ic_offset += len;
> -	} else {
> -		*continued_write = 1;
> +	else
>  		xlog_state_switch_iclogs(log, iclog, iclog->ic_size);
> -	}
>  	*iclogp = iclog;
>  
>  	ASSERT(iclog->ic_offset <= iclog->ic_size);

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index ca8a9313d9c5..da660e09aa5c 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -49,7 +49,6 @@  xlog_state_get_iclog_space(
 	int			len,
 	struct xlog_in_core	**iclog,
 	struct xlog_ticket	*ticket,
-	int			*continued_write,
 	int			*logoffsetp);
 STATIC void
 xlog_grant_push_ail(
@@ -2277,8 +2276,7 @@  xlog_write_get_more_iclog_space(
 	uint32_t		*log_offset,
 	uint32_t		len,
 	uint32_t		*record_cnt,
-	uint32_t		*data_cnt,
-	int			*contwr)
+	uint32_t		*data_cnt)
 {
 	struct xlog_in_core	*iclog = *iclogp;
 	struct xlog		*log = iclog->ic_log;
@@ -2292,8 +2290,8 @@  xlog_write_get_more_iclog_space(
 	if (error)
 		return error;
 
-	error = xlog_state_get_iclog_space(log, len, &iclog,
-				ticket, contwr, log_offset);
+	error = xlog_state_get_iclog_space(log, len, &iclog, ticket,
+					log_offset);
 	if (error)
 		return error;
 	*record_cnt = 0;
@@ -2316,8 +2314,7 @@  xlog_write_partial(
 	uint32_t		*log_offset,
 	uint32_t		*len,
 	uint32_t		*record_cnt,
-	uint32_t		*data_cnt,
-	int			*contwr)
+	uint32_t		*data_cnt)
 {
 	struct xlog_in_core	*iclog = *iclogp;
 	struct xlog_op_header	*ophdr;
@@ -2345,7 +2342,7 @@  xlog_write_partial(
 					sizeof(struct xlog_op_header)) {
 			error = xlog_write_get_more_iclog_space(ticket,
 					&iclog, log_offset, *len, record_cnt,
-					data_cnt, contwr);
+					data_cnt);
 			if (error)
 				return error;
 		}
@@ -2397,7 +2394,7 @@  xlog_write_partial(
 			error = xlog_write_get_more_iclog_space(ticket,
 					&iclog, log_offset,
 					*len + sizeof(struct xlog_op_header),
-					record_cnt, data_cnt, contwr);
+					record_cnt, data_cnt);
 			if (error)
 				return error;
 
@@ -2492,7 +2489,6 @@  xlog_write(
 {
 	struct xlog_in_core	*iclog = NULL;
 	struct xfs_log_vec	*lv = log_vector;
-	int			contwr = 0;
 	uint32_t		record_cnt = 0;
 	uint32_t		data_cnt = 0;
 	int			error = 0;
@@ -2506,7 +2502,7 @@  xlog_write(
 	}
 
 	error = xlog_state_get_iclog_space(log, len, &iclog, ticket,
-					   &contwr, &log_offset);
+					   &log_offset);
 	if (error)
 		return error;
 
@@ -2529,7 +2525,7 @@  xlog_write(
 		    lv->lv_bytes > iclog->ic_size - log_offset) {
 			error = xlog_write_partial(lv, ticket, &iclog,
 					&log_offset, &len, &record_cnt,
-					&data_cnt, &contwr);
+					&data_cnt);
 			if (error) {
 				/*
 				 * We have no iclog to release, so just return
@@ -2909,7 +2905,6 @@  xlog_state_get_iclog_space(
 	int			len,
 	struct xlog_in_core	**iclogp,
 	struct xlog_ticket	*ticket,
-	int			*continued_write,
 	int			*logoffsetp)
 {
 	int		  log_offset;
@@ -2987,13 +2982,10 @@  xlog_state_get_iclog_space(
 	 * iclogs (to mark it taken), this particular iclog will release/sync
 	 * to disk in xlog_write().
 	 */
-	if (len <= iclog->ic_size - iclog->ic_offset) {
-		*continued_write = 0;
+	if (len <= iclog->ic_size - iclog->ic_offset)
 		iclog->ic_offset += len;
-	} else {
-		*continued_write = 1;
+	else
 		xlog_state_switch_iclogs(log, iclog, iclog->ic_size);
-	}
 	*iclogp = iclog;
 
 	ASSERT(iclog->ic_offset <= iclog->ic_size);

[14/16] xfs: xlog_write() no longer needs contwr state

Commit Message

Comments

Patch