Commit 35f4521f authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: convert xfs_log_recover_item_t to struct xfs_log_recover_item

Remove the old typedefs.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent c1995079
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
/* /*
* item headers are in ri_buf[0]. Additional buffers follow. * item headers are in ri_buf[0]. Additional buffers follow.
*/ */
typedef struct xlog_recover_item { struct xlog_recover_item {
struct list_head ri_list; struct list_head ri_list;
int ri_type; int ri_type;
int ri_cnt; /* count of regions found */ int ri_cnt; /* count of regions found */
int ri_total; /* total regions */ int ri_total; /* total regions */
xfs_log_iovec_t *ri_buf; /* ptr to regions buffer */ xfs_log_iovec_t *ri_buf; /* ptr to regions buffer */
} xlog_recover_item_t; };
struct xlog_recover { struct xlog_recover {
struct hlist_node r_list; struct hlist_node r_list;
......
...@@ -1841,7 +1841,7 @@ xlog_recover_reorder_trans( ...@@ -1841,7 +1841,7 @@ xlog_recover_reorder_trans(
struct xlog_recover *trans, struct xlog_recover *trans,
int pass) int pass)
{ {
xlog_recover_item_t *item, *n; struct xlog_recover_item *item, *n;
int error = 0; int error = 0;
LIST_HEAD(sort_list); LIST_HEAD(sort_list);
LIST_HEAD(cancel_list); LIST_HEAD(cancel_list);
...@@ -2056,7 +2056,7 @@ xlog_recover_buffer_pass1( ...@@ -2056,7 +2056,7 @@ xlog_recover_buffer_pass1(
STATIC int STATIC int
xlog_recover_do_inode_buffer( xlog_recover_do_inode_buffer(
struct xfs_mount *mp, struct xfs_mount *mp,
xlog_recover_item_t *item, struct xlog_recover_item *item,
struct xfs_buf *bp, struct xfs_buf *bp,
xfs_buf_log_format_t *buf_f) xfs_buf_log_format_t *buf_f)
{ {
...@@ -2561,7 +2561,7 @@ xlog_recover_validate_buf_type( ...@@ -2561,7 +2561,7 @@ xlog_recover_validate_buf_type(
STATIC void STATIC void
xlog_recover_do_reg_buffer( xlog_recover_do_reg_buffer(
struct xfs_mount *mp, struct xfs_mount *mp,
xlog_recover_item_t *item, struct xlog_recover_item *item,
struct xfs_buf *bp, struct xfs_buf *bp,
xfs_buf_log_format_t *buf_f, xfs_buf_log_format_t *buf_f,
xfs_lsn_t current_lsn) xfs_lsn_t current_lsn)
...@@ -3759,7 +3759,7 @@ STATIC int ...@@ -3759,7 +3759,7 @@ STATIC int
xlog_recover_do_icreate_pass2( xlog_recover_do_icreate_pass2(
struct xlog *log, struct xlog *log,
struct list_head *buffer_list, struct list_head *buffer_list,
xlog_recover_item_t *item) struct xlog_recover_item *item)
{ {
struct xfs_mount *mp = log->l_mp; struct xfs_mount *mp = log->l_mp;
struct xfs_icreate_log *icl; struct xfs_icreate_log *icl;
...@@ -4134,9 +4134,9 @@ STATIC void ...@@ -4134,9 +4134,9 @@ STATIC void
xlog_recover_add_item( xlog_recover_add_item(
struct list_head *head) 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); INIT_LIST_HEAD(&item->ri_list);
list_add_tail(&item->ri_list, head); list_add_tail(&item->ri_list, head);
} }
...@@ -4148,7 +4148,7 @@ xlog_recover_add_to_cont_trans( ...@@ -4148,7 +4148,7 @@ xlog_recover_add_to_cont_trans(
char *dp, char *dp,
int len) int len)
{ {
xlog_recover_item_t *item; struct xlog_recover_item *item;
char *ptr, *old_ptr; char *ptr, *old_ptr;
int old_len; int old_len;
...@@ -4171,7 +4171,8 @@ xlog_recover_add_to_cont_trans( ...@@ -4171,7 +4171,8 @@ xlog_recover_add_to_cont_trans(
} }
/* take the tail entry */ /* 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_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
old_len = item->ri_buf[item->ri_cnt-1].i_len; old_len = item->ri_buf[item->ri_cnt-1].i_len;
...@@ -4205,7 +4206,7 @@ xlog_recover_add_to_trans( ...@@ -4205,7 +4206,7 @@ xlog_recover_add_to_trans(
int len) int len)
{ {
struct xfs_inode_log_format *in_f; /* any will do */ struct xfs_inode_log_format *in_f; /* any will do */
xlog_recover_item_t *item; struct xlog_recover_item *item;
char *ptr; char *ptr;
if (!len) if (!len)
...@@ -4241,13 +4242,14 @@ xlog_recover_add_to_trans( ...@@ -4241,13 +4242,14 @@ xlog_recover_add_to_trans(
in_f = (struct xfs_inode_log_format *)ptr; in_f = (struct xfs_inode_log_format *)ptr;
/* take the tail entry */ /* 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 && if (item->ri_total != 0 &&
item->ri_total == item->ri_cnt) { item->ri_total == item->ri_cnt) {
/* tail item is in use, get a new one */ /* tail item is in use, get a new one */
xlog_recover_add_item(&trans->r_itemq); xlog_recover_add_item(&trans->r_itemq);
item = list_entry(trans->r_itemq.prev, 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 */ if (item->ri_total == 0) { /* first region to be added */
...@@ -4293,7 +4295,7 @@ STATIC void ...@@ -4293,7 +4295,7 @@ STATIC void
xlog_recover_free_trans( xlog_recover_free_trans(
struct xlog_recover *trans) struct xlog_recover *trans)
{ {
xlog_recover_item_t *item, *n; struct xlog_recover_item *item, *n;
int i; int i;
hlist_del_init(&trans->r_list); hlist_del_init(&trans->r_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment