1 files changed, 11 insertions, 12 deletions
diff --git a/fs/xfs/xfs_log_recover.h b/fs/xfs/xfs_log_recover.h
index b22545555301..75d749207258 100644
--- a/fs/xfs/xfs_log_recover.h
+++ b/fs/xfs/xfs_log_recover.h
@@ -35,22 +35,21 @@
 * item headers are in ri_buf[0].  Additional buffers follow.
 */
 typedef struct xlog_recover_item {
-        struct xlog_recover_item *ri_next;
+        struct list_head        ri_list;
-        struct xlog_recover_item *ri_prev;
+        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_tid;
 typedef struct xlog_recover {
-        struct xlog_recover *r_next;
+        struct hlist_node       r_list;
-        xlog_tid_t          r_log_tid;          /* log's transaction id */
+        xlog_tid_t              r_log_tid;      /* log's transaction id */
-        xfs_trans_header_t  r_theader;          /* trans header for partial */
+        xfs_trans_header_t      r_theader;      /* trans header for partial */
-        int                 r_state;            /* not needed */
+        int                     r_state;        /* not needed */
-        xfs_lsn_t           r_lsn;              /* xact lsn */
+        xfs_lsn_t               r_lsn;          /* xact lsn */
-        xlog_recover_item_t *r_itemq;           /* q for items */
+        struct list_head        r_itemq;        /* q for items */
 } xlog_recover_t;
 #define ITEM_TYPE(i)    (*(ushort *)(i)->ri_buf[0].i_addr)

diff --git a/fs/xfs/xfs_log_recover.h b/fs/xfs/xfs_log_recover.h index b22545555301..75d749207258 100644 --- a/fs/xfs/xfs_log_recover.h +++ b/fs/xfs/xfs_log_recover.h
@@ -35,22 +35,21 @@
35	* item headers are in ri_buf[0]. Additional buffers follow.	35	* item headers are in ri_buf[0]. Additional buffers follow.
36	*/	36	*/
37	typedef struct xlog_recover_item {	37	typedef struct xlog_recover_item {
38	struct xlog_recover_item *ri_next;	38	struct list_head ri_list;
39	struct xlog_recover_item *ri_prev;	39	int ri_type;
40	int ri_type;	40	int ri_cnt; /* count of regions found */
41	int ri_cnt; /* count of regions found */	41	int ri_total; /* total regions */
42	int ri_total; /* total regions */	42	xfs_log_iovec_t ri_buf; / ptr to regions buffer */
43	xfs_log_iovec_t ri_buf; / ptr to regions buffer */
44	} xlog_recover_item_t;	43	} xlog_recover_item_t;
45		44
46	struct xlog_tid;	45	struct xlog_tid;
47	typedef struct xlog_recover {	46	typedef struct xlog_recover {
48	struct xlog_recover *r_next;	47	struct hlist_node r_list;
49	xlog_tid_t r_log_tid; /* log's transaction id */	48	xlog_tid_t r_log_tid; /* log's transaction id */
50	xfs_trans_header_t r_theader; /* trans header for partial */	49	xfs_trans_header_t r_theader; /* trans header for partial */
51	int r_state; /* not needed */	50	int r_state; /* not needed */
52	xfs_lsn_t r_lsn; /* xact lsn */	51	xfs_lsn_t r_lsn; /* xact lsn */
53	xlog_recover_item_t r_itemq; / q for items */	52	struct list_head r_itemq; /* q for items */
54	} xlog_recover_t;	53	} xlog_recover_t;
55		54
56	#define ITEM_TYPE(i) ((ushort )(i)->ri_buf[0].i_addr)	55	#define ITEM_TYPE(i) ((ushort )(i)->ri_buf[0].i_addr)