[01/28] xfs: convert xfs_log_recover_item_t to struct xfs_log_recover_item
diff mbox series

Message ID 158864103888.182683.1949900429505759832.stgit@magnolia
State Superseded
Headers show
Series
  • xfs: refactor log recovery
Related show

Commit Message

Darrick J. Wong May 5, 2020, 1:10 a.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

Remove the old typedefs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/libxfs/xfs_log_recover.h |    4 ++--
 fs/xfs/xfs_log_recover.c        |   26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

Comments

Chandan Babu R May 5, 2020, 3:33 a.m. UTC | #1
On Tuesday 5 May 2020 6:40:39 AM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Remove the old typedefs.
>

Straight forward change.

Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>

> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  fs/xfs/libxfs/xfs_log_recover.h |    4 ++--
>  fs/xfs/xfs_log_recover.c        |   26 ++++++++++++++------------
>  2 files changed, 16 insertions(+), 14 deletions(-)
> 
> 
> diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
> index 3bf671637a91..148e0cb5d379 100644
> --- a/fs/xfs/libxfs/xfs_log_recover.h
> +++ b/fs/xfs/libxfs/xfs_log_recover.h
> @@ -22,13 +22,13 @@
>  /*
>   * item headers are in ri_buf[0].  Additional buffers follow.
>   */
> -typedef struct xlog_recover_item {
> +struct xlog_recover_item {
>  	struct list_head	ri_list;
>  	int			ri_type;
>  	int			ri_cnt;	/* count of regions found */
>  	int			ri_total;	/* total regions */
>  	xfs_log_iovec_t		*ri_buf;	/* ptr to regions buffer */
> -} xlog_recover_item_t;
> +};
>  
>  struct xlog_recover {
>  	struct hlist_node	r_list;
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index d0e2dd81de53..c2c06f70fb8a 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -1841,7 +1841,7 @@ xlog_recover_reorder_trans(
>  	struct xlog_recover	*trans,
>  	int			pass)
>  {
> -	xlog_recover_item_t	*item, *n;
> +	struct xlog_recover_item *item, *n;
>  	int			error = 0;
>  	LIST_HEAD(sort_list);
>  	LIST_HEAD(cancel_list);
> @@ -2056,7 +2056,7 @@ xlog_recover_buffer_pass1(
>  STATIC int
>  xlog_recover_do_inode_buffer(
>  	struct xfs_mount	*mp,
> -	xlog_recover_item_t	*item,
> +	struct xlog_recover_item *item,
>  	struct xfs_buf		*bp,
>  	xfs_buf_log_format_t	*buf_f)
>  {
> @@ -2561,7 +2561,7 @@ xlog_recover_validate_buf_type(
>  STATIC void
>  xlog_recover_do_reg_buffer(
>  	struct xfs_mount	*mp,
> -	xlog_recover_item_t	*item,
> +	struct xlog_recover_item *item,
>  	struct xfs_buf		*bp,
>  	xfs_buf_log_format_t	*buf_f,
>  	xfs_lsn_t		current_lsn)
> @@ -3759,7 +3759,7 @@ STATIC int
>  xlog_recover_do_icreate_pass2(
>  	struct xlog		*log,
>  	struct list_head	*buffer_list,
> -	xlog_recover_item_t	*item)
> +	struct xlog_recover_item *item)
>  {
>  	struct xfs_mount	*mp = log->l_mp;
>  	struct xfs_icreate_log	*icl;
> @@ -4134,9 +4134,9 @@ STATIC void
>  xlog_recover_add_item(
>  	struct list_head	*head)
>  {
> -	xlog_recover_item_t	*item;
> +	struct xlog_recover_item *item;
>  
> -	item = kmem_zalloc(sizeof(xlog_recover_item_t), 0);
> +	item = kmem_zalloc(sizeof(struct xlog_recover_item), 0);
>  	INIT_LIST_HEAD(&item->ri_list);
>  	list_add_tail(&item->ri_list, head);
>  }
> @@ -4148,7 +4148,7 @@ xlog_recover_add_to_cont_trans(
>  	char			*dp,
>  	int			len)
>  {
> -	xlog_recover_item_t	*item;
> +	struct xlog_recover_item *item;
>  	char			*ptr, *old_ptr;
>  	int			old_len;
>  
> @@ -4171,7 +4171,8 @@ xlog_recover_add_to_cont_trans(
>  	}
>  
>  	/* take the tail entry */
> -	item = list_entry(trans->r_itemq.prev, xlog_recover_item_t, ri_list);
> +	item = list_entry(trans->r_itemq.prev, struct xlog_recover_item,
> +			  ri_list);
>  
>  	old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
>  	old_len = item->ri_buf[item->ri_cnt-1].i_len;
> @@ -4205,7 +4206,7 @@ xlog_recover_add_to_trans(
>  	int			len)
>  {
>  	struct xfs_inode_log_format	*in_f;			/* any will do */
> -	xlog_recover_item_t	*item;
> +	struct xlog_recover_item *item;
>  	char			*ptr;
>  
>  	if (!len)
> @@ -4241,13 +4242,14 @@ xlog_recover_add_to_trans(
>  	in_f = (struct xfs_inode_log_format *)ptr;
>  
>  	/* take the tail entry */
> -	item = list_entry(trans->r_itemq.prev, xlog_recover_item_t, ri_list);
> +	item = list_entry(trans->r_itemq.prev, struct xlog_recover_item,
> +			  ri_list);
>  	if (item->ri_total != 0 &&
>  	     item->ri_total == item->ri_cnt) {
>  		/* tail item is in use, get a new one */
>  		xlog_recover_add_item(&trans->r_itemq);
>  		item = list_entry(trans->r_itemq.prev,
> -					xlog_recover_item_t, ri_list);
> +					struct xlog_recover_item, ri_list);
>  	}
>  
>  	if (item->ri_total == 0) {		/* first region to be added */
> @@ -4293,7 +4295,7 @@ STATIC void
>  xlog_recover_free_trans(
>  	struct xlog_recover	*trans)
>  {
> -	xlog_recover_item_t	*item, *n;
> +	struct xlog_recover_item *item, *n;
>  	int			i;
>  
>  	hlist_del_init(&trans->r_list);
> 
>
Christoph Hellwig May 6, 2020, 2:59 p.m. UTC | #2
On Mon, May 04, 2020 at 06:10:39PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Remove the old typedefs.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Patch
diff mbox series

diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index 3bf671637a91..148e0cb5d379 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -22,13 +22,13 @@ 
 /*
  * item headers are in ri_buf[0].  Additional buffers follow.
  */
-typedef struct xlog_recover_item {
+struct xlog_recover_item {
 	struct list_head	ri_list;
 	int			ri_type;
 	int			ri_cnt;	/* count of regions found */
 	int			ri_total;	/* total regions */
 	xfs_log_iovec_t		*ri_buf;	/* ptr to regions buffer */
-} xlog_recover_item_t;
+};
 
 struct xlog_recover {
 	struct hlist_node	r_list;
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index d0e2dd81de53..c2c06f70fb8a 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1841,7 +1841,7 @@  xlog_recover_reorder_trans(
 	struct xlog_recover	*trans,
 	int			pass)
 {
-	xlog_recover_item_t	*item, *n;
+	struct xlog_recover_item *item, *n;
 	int			error = 0;
 	LIST_HEAD(sort_list);
 	LIST_HEAD(cancel_list);
@@ -2056,7 +2056,7 @@  xlog_recover_buffer_pass1(
 STATIC int
 xlog_recover_do_inode_buffer(
 	struct xfs_mount	*mp,
-	xlog_recover_item_t	*item,
+	struct xlog_recover_item *item,
 	struct xfs_buf		*bp,
 	xfs_buf_log_format_t	*buf_f)
 {
@@ -2561,7 +2561,7 @@  xlog_recover_validate_buf_type(
 STATIC void
 xlog_recover_do_reg_buffer(
 	struct xfs_mount	*mp,
-	xlog_recover_item_t	*item,
+	struct xlog_recover_item *item,
 	struct xfs_buf		*bp,
 	xfs_buf_log_format_t	*buf_f,
 	xfs_lsn_t		current_lsn)
@@ -3759,7 +3759,7 @@  STATIC int
 xlog_recover_do_icreate_pass2(
 	struct xlog		*log,
 	struct list_head	*buffer_list,
-	xlog_recover_item_t	*item)
+	struct xlog_recover_item *item)
 {
 	struct xfs_mount	*mp = log->l_mp;
 	struct xfs_icreate_log	*icl;
@@ -4134,9 +4134,9 @@  STATIC void
 xlog_recover_add_item(
 	struct list_head	*head)
 {
-	xlog_recover_item_t	*item;
+	struct xlog_recover_item *item;
 
-	item = kmem_zalloc(sizeof(xlog_recover_item_t), 0);
+	item = kmem_zalloc(sizeof(struct xlog_recover_item), 0);
 	INIT_LIST_HEAD(&item->ri_list);
 	list_add_tail(&item->ri_list, head);
 }
@@ -4148,7 +4148,7 @@  xlog_recover_add_to_cont_trans(
 	char			*dp,
 	int			len)
 {
-	xlog_recover_item_t	*item;
+	struct xlog_recover_item *item;
 	char			*ptr, *old_ptr;
 	int			old_len;
 
@@ -4171,7 +4171,8 @@  xlog_recover_add_to_cont_trans(
 	}
 
 	/* take the tail entry */
-	item = list_entry(trans->r_itemq.prev, xlog_recover_item_t, ri_list);
+	item = list_entry(trans->r_itemq.prev, struct xlog_recover_item,
+			  ri_list);
 
 	old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
 	old_len = item->ri_buf[item->ri_cnt-1].i_len;
@@ -4205,7 +4206,7 @@  xlog_recover_add_to_trans(
 	int			len)
 {
 	struct xfs_inode_log_format	*in_f;			/* any will do */
-	xlog_recover_item_t	*item;
+	struct xlog_recover_item *item;
 	char			*ptr;
 
 	if (!len)
@@ -4241,13 +4242,14 @@  xlog_recover_add_to_trans(
 	in_f = (struct xfs_inode_log_format *)ptr;
 
 	/* take the tail entry */
-	item = list_entry(trans->r_itemq.prev, xlog_recover_item_t, ri_list);
+	item = list_entry(trans->r_itemq.prev, struct xlog_recover_item,
+			  ri_list);
 	if (item->ri_total != 0 &&
 	     item->ri_total == item->ri_cnt) {
 		/* tail item is in use, get a new one */
 		xlog_recover_add_item(&trans->r_itemq);
 		item = list_entry(trans->r_itemq.prev,
-					xlog_recover_item_t, ri_list);
+					struct xlog_recover_item, ri_list);
 	}
 
 	if (item->ri_total == 0) {		/* first region to be added */
@@ -4293,7 +4295,7 @@  STATIC void
 xlog_recover_free_trans(
 	struct xlog_recover	*trans)
 {
-	xlog_recover_item_t	*item, *n;
+	struct xlog_recover_item *item, *n;
 	int			i;
 
 	hlist_del_init(&trans->r_list);