xfs: convert xfs_log_recover_item_t to struct xfs_log_recover_item

Source kernel commit: 35f4521fd3a001fb290a1780f8beeffb06d99a04

Remove the old typedefs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/libxlog.h b/include/libxlog.h
index 5e94fa1e0be8069aed118fa4988ca4945ab395aa..89e0ed6690867abb4008ece41b4d626f48c2f281 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -89,7 +89,7 @@ extern int    xlog_find_tail(struct xlog *log, xfs_daddr_t *head_blk,
 
 extern int     xlog_recover(struct xlog *log, int readonly);
 extern void    xlog_recover_print_data(char *p, int len);
-extern void    xlog_recover_print_logitem(xlog_recover_item_t *item);
+extern void    xlog_recover_print_logitem(struct xlog_recover_item *item);
 extern void    xlog_recover_print_trans_head(struct xlog_recover *tr);
 extern int     xlog_print_find_oldest(struct xlog *log, xfs_daddr_t *last_blk);
 

diff --git a/include/xfs_log_recover.h b/include/xfs_log_recover.h
index d03b4e836c432daa57a38808fc8e58260dd1d572..ea6dede2555e8d6a08d856e5741cf8526c642922 100644 (file)
--- a/include/xfs_log_recover.h
+++ b/include/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/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 78fbafab702d107954b82d11078f4513efeb10d8..ec6533991f0fa0d71f8d165a7460719d43ab9f98 100644 (file)
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -1012,9 +1012,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);
 }
@@ -1026,7 +1026,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;
 
@@ -1039,7 +1039,8 @@ xlog_recover_add_to_cont_trans(
                return 0;
        }
        /* 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;
@@ -1073,7 +1074,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)
@@ -1097,13 +1098,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 */
@@ -1140,7 +1142,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;
 
        list_for_each_entry_safe(item, n, &trans->r_itemq, ri_list) {

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index e2e28b9c3299d555fc45b31a5e2f9af81de3c8fc..1924a0af70b6384d33c6997e57f25e0e52822ba1 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -68,7 +68,7 @@ xlog_recover_print_data(
 
 STATIC void
 xlog_recover_print_buffer(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        xfs_agi_t               *agi;
        xfs_agf_t               *agf;
@@ -183,7 +183,7 @@ xlog_recover_print_buffer(
 
 STATIC void
 xlog_recover_print_quotaoff(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        xfs_qoff_logformat_t    *qoff_f;
        char                    str[32] = { 0 };
@@ -202,7 +202,7 @@ xlog_recover_print_quotaoff(
 
 STATIC void
 xlog_recover_print_dquot(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        xfs_dq_logformat_t      *f;
        struct xfs_disk_dquot   *d;
@@ -268,7 +268,7 @@ xlog_recover_print_inode_core(
 
 STATIC void
 xlog_recover_print_inode(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        struct xfs_inode_log_format     f_buf;
        struct xfs_inode_log_format     *f;
@@ -384,7 +384,7 @@ xlog_recover_print_icreate(
 
 void
 xlog_recover_print_logitem(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item        *item)
 {
        switch (ITEM_TYPE(item)) {
        case XFS_LI_BUF:
@@ -434,7 +434,7 @@ xlog_recover_print_logitem(
 
 static void
 xlog_recover_print_item(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        int                     i;
 
@@ -502,7 +502,7 @@ xlog_recover_print_trans(
        struct list_head        *itemq,
        int                     print)
 {
-       xlog_recover_item_t     *item;
+       struct xlog_recover_item *item;
 
        if (print < 3)
                return;

diff --git a/logprint/log_redo.c b/logprint/log_redo.c
index f1f690ef71a318f17aa2162b1518113b65a94774..297e203d097609ccba590363c2d9ef50fbc1c890 100644 (file)
--- a/logprint/log_redo.c
+++ b/logprint/log_redo.c
@@ -128,7 +128,7 @@ error:
 
 void
 xlog_recover_print_efi(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        xfs_efi_log_format_t    *f, *src_f;
        xfs_extent_t            *ex;
@@ -202,7 +202,7 @@ xlog_print_trans_efd(char **ptr, uint len)
 
 void
 xlog_recover_print_efd(
-       xlog_recover_item_t     *item)
+       struct xlog_recover_item *item)
 {
        xfs_efd_log_format_t    *f;
 

diff --git a/logprint/logprint.h b/logprint/logprint.h
index 98ac0d460d6642bde2fdb8ace100c75c33aac681..ee85bfe5f21f27be4cff89445d3c18bb06ecbec6 100644 (file)
--- a/logprint/logprint.h
+++ b/logprint/logprint.h
@@ -33,9 +33,9 @@ extern struct xfs_inode_log_format *
        xfs_inode_item_format_convert(char *, uint, struct xfs_inode_log_format *);
 
 extern int xlog_print_trans_efi(char **ptr, uint src_len, int continued);
-extern void xlog_recover_print_efi(xlog_recover_item_t *item);
+extern void xlog_recover_print_efi(struct xlog_recover_item *item);
 extern int xlog_print_trans_efd(char **ptr, uint len);
-extern void xlog_recover_print_efd(xlog_recover_item_t *item);
+extern void xlog_recover_print_efd(struct xlog_recover_item *item);
 
 extern int xlog_print_trans_rui(char **ptr, uint src_len, int continued);
 extern void xlog_recover_print_rui(struct xlog_recover_item *item);