xfs: remove the xlog_in_core_t typedef

Switch the few remaining users to use the underlying struct directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 47a8e74c8c5ce0453002991f775b740a59d51bef..a311385b23d8b44813341c44f52d935c990577cf 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1368,8 +1368,8 @@ xlog_alloc_log(
        int                     num_bblks)
 {
        struct xlog             *log;
-       xlog_in_core_t          **iclogp;
-       xlog_in_core_t          *iclog, *prev_iclog=NULL;
+       struct xlog_in_core     **iclogp;
+       struct xlog_in_core     *iclog, *prev_iclog = NULL;
        int                     i;
        int                     error = -ENOMEM;
        uint                    log2_size = 0;
@@ -1813,10 +1813,10 @@ xlog_sync(
  */
 STATIC void
 xlog_dealloc_log(
-       struct xlog     *log)
+       struct xlog             *log)
 {
-       xlog_in_core_t  *iclog, *next_iclog;
-       int             i;
+       struct xlog_in_core     *iclog, *next_iclog;
+       int                     i;
 
        /*
         * Destroy the CIL after waiting for iclog IO completion because an
@@ -3293,7 +3293,7 @@ xlog_verify_iclog(
        int                     count)
 {
        struct xlog_rec_header  *rhead = iclog->ic_header;
-       xlog_in_core_t          *icptr;
+       struct xlog_in_core     *icptr;
        void                    *base_ptr, *ptr;
        ptrdiff_t               field_offset;
        uint8_t                 clientid;
@@ -3481,11 +3481,10 @@ xlog_force_shutdown(
 
 STATIC int
 xlog_iclogs_empty(
-       struct xlog     *log)
+       struct xlog             *log)
 {
-       xlog_in_core_t  *iclog;
+       struct xlog_in_core     *iclog = log->l_iclog;
 
-       iclog = log->l_iclog;
        do {
                /* endianness does not matter here, zero is zero in
                 * any language.
@@ -3494,6 +3493,7 @@ xlog_iclogs_empty(
                        return 0;
                iclog = iclog->ic_next;
        } while (iclog != log->l_iclog);
+
        return 1;
 }
 

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 17733ba7f25119fdd62bb7e265166aef3e4ddfc7..0fe59f0525aae7d32bc0550d0e375abb7d5eb322 100644 (file)
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -181,7 +181,7 @@ struct xlog_ticket {
  * We'll put all the read-only and l_icloglock fields in the first cacheline,
  * and move everything else out to subsequent cachelines.
  */
-typedef struct xlog_in_core {
+struct xlog_in_core {
        wait_queue_head_t       ic_force_wait;
        wait_queue_head_t       ic_write_wait;
        struct xlog_in_core     *ic_next;
@@ -204,7 +204,7 @@ typedef struct xlog_in_core {
        struct work_struct      ic_end_io_work;
        struct bio              ic_bio;
        struct bio_vec          ic_bvec[];
-} xlog_in_core_t;
+};
 
 /*
  * The CIL context is used to aggregate per-transaction details as well be
@@ -418,7 +418,7 @@ struct xlog {
                                                /* waiting for iclog flush */
        int                     l_covered_state;/* state of "covering disk
                                                 * log entries" */
-       xlog_in_core_t          *l_iclog;       /* head log queue       */
+       struct xlog_in_core     *l_iclog;       /* head log queue       */
        spinlock_t              l_icloglock;    /* grab to change iclog state */
        int                     l_curr_cycle;   /* Cycle number of log writes */
        int                     l_prev_cycle;   /* Cycle number before last