Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xfs: remove the xfs_log_item_t typedef

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

authored by

Christoph Hellwig and committed by
Darrick J. Wong
efe2330f b3b14aac

+48 -48
+3 -3
fs/xfs/xfs_buf_item.c
··· 982 982 */ 983 983 void 984 984 xfs_buf_attach_iodone( 985 - xfs_buf_t *bp, 986 - void (*cb)(xfs_buf_t *, xfs_log_item_t *), 987 - xfs_log_item_t *lip) 985 + struct xfs_buf *bp, 986 + void (*cb)(struct xfs_buf *, struct xfs_log_item *), 987 + struct xfs_log_item *lip) 988 988 { 989 989 ASSERT(xfs_buf_islocked(bp)); 990 990
+3 -3
fs/xfs/xfs_buf_item.h
··· 39 39 * locked, and which 128 byte chunks of the buffer are dirty. 40 40 */ 41 41 struct xfs_buf_log_item { 42 - xfs_log_item_t bli_item; /* common item structure */ 42 + struct xfs_log_item bli_item; /* common item structure */ 43 43 struct xfs_buf *bli_buf; /* real buffer pointer */ 44 44 unsigned int bli_flags; /* misc flags */ 45 45 unsigned int bli_recur; /* lock recursion count */ ··· 55 55 void xfs_buf_item_log(struct xfs_buf_log_item *, uint, uint); 56 56 bool xfs_buf_item_dirty_format(struct xfs_buf_log_item *); 57 57 void xfs_buf_attach_iodone(struct xfs_buf *, 58 - void(*)(struct xfs_buf *, xfs_log_item_t *), 59 - xfs_log_item_t *); 58 + void(*)(struct xfs_buf *, struct xfs_log_item *), 59 + struct xfs_log_item *); 60 60 void xfs_buf_iodone_callbacks(struct xfs_buf *); 61 61 void xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *); 62 62 bool xfs_buf_resubmit_failed_buffers(struct xfs_buf *,
+2 -2
fs/xfs/xfs_dquot_item.h
··· 12 12 struct xfs_qoff_logitem; 13 13 14 14 typedef struct xfs_dq_logitem { 15 - xfs_log_item_t qli_item; /* common portion */ 15 + struct xfs_log_item qli_item; /* common portion */ 16 16 struct xfs_dquot *qli_dquot; /* dquot ptr */ 17 17 xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ 18 18 } xfs_dq_logitem_t; 19 19 20 20 typedef struct xfs_qoff_logitem { 21 - xfs_log_item_t qql_item; /* common portion */ 21 + struct xfs_log_item qql_item; /* common portion */ 22 22 struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ 23 23 unsigned int qql_flags; 24 24 } xfs_qoff_logitem_t;
+2 -2
fs/xfs/xfs_extfree_item.h
··· 51 51 * AIL, so at this point both the EFI and EFD are freed. 52 52 */ 53 53 typedef struct xfs_efi_log_item { 54 - xfs_log_item_t efi_item; 54 + struct xfs_log_item efi_item; 55 55 atomic_t efi_refcount; 56 56 atomic_t efi_next_extent; 57 57 unsigned long efi_flags; /* misc flags */ ··· 64 64 * have been freed. 65 65 */ 66 66 typedef struct xfs_efd_log_item { 67 - xfs_log_item_t efd_item; 67 + struct xfs_log_item efd_item; 68 68 xfs_efi_log_item_t *efd_efip; 69 69 uint efd_next_extent; 70 70 xfs_efd_log_format_t efd_format;
+6 -6
fs/xfs/xfs_inode.c
··· 441 441 */ 442 442 static void 443 443 xfs_lock_inodes( 444 - xfs_inode_t **ips, 445 - int inodes, 446 - uint lock_mode) 444 + struct xfs_inode **ips, 445 + int inodes, 446 + uint lock_mode) 447 447 { 448 - int attempts = 0, i, j, try_lock; 449 - xfs_log_item_t *lp; 448 + int attempts = 0, i, j, try_lock; 449 + struct xfs_log_item *lp; 450 450 451 451 /* 452 452 * Currently supports between 2 and 5 inodes with exclusive locking. We ··· 551 551 struct xfs_inode *temp; 552 552 uint mode_temp; 553 553 int attempts = 0; 554 - xfs_log_item_t *lp; 554 + struct xfs_log_item *lp; 555 555 556 556 ASSERT(hweight32(ip0_mode) == 1); 557 557 ASSERT(hweight32(ip1_mode) == 1);
+1 -1
fs/xfs/xfs_inode_item.h
··· 14 14 struct xfs_mount; 15 15 16 16 typedef struct xfs_inode_log_item { 17 - xfs_log_item_t ili_item; /* common portion */ 17 + struct xfs_log_item ili_item; /* common portion */ 18 18 struct xfs_inode *ili_inode; /* inode ptr */ 19 19 xfs_lsn_t ili_flush_lsn; /* lsn at last flush */ 20 20 xfs_lsn_t ili_last_lsn; /* lsn at last transaction */
+1 -1
fs/xfs/xfs_log_recover.c
··· 3384 3384 { 3385 3385 xfs_efd_log_format_t *efd_formatp; 3386 3386 xfs_efi_log_item_t *efip = NULL; 3387 - xfs_log_item_t *lip; 3387 + struct xfs_log_item *lip; 3388 3388 uint64_t efi_id; 3389 3389 struct xfs_ail_cursor cur; 3390 3390 struct xfs_ail *ailp = log->l_ailp;
+8 -8
fs/xfs/xfs_trans.h
··· 27 27 struct xfs_bui_log_item; 28 28 struct xfs_bud_log_item; 29 29 30 - typedef struct xfs_log_item { 30 + struct xfs_log_item { 31 31 struct list_head li_ail; /* AIL pointers */ 32 32 struct list_head li_trans; /* transaction list */ 33 33 xfs_lsn_t li_lsn; /* last on-disk lsn */ ··· 48 48 struct xfs_log_vec *li_lv; /* active log vector */ 49 49 struct xfs_log_vec *li_lv_shadow; /* standby vector */ 50 50 xfs_lsn_t li_seq; /* CIL commit seq */ 51 - } xfs_log_item_t; 51 + }; 52 52 53 53 /* 54 54 * li_flags use the (set/test/clear)_bit atomic interfaces because updates can ··· 68 68 69 69 struct xfs_item_ops { 70 70 unsigned flags; 71 - void (*iop_size)(xfs_log_item_t *, int *, int *); 72 - void (*iop_format)(xfs_log_item_t *, struct xfs_log_vec *); 73 - void (*iop_pin)(xfs_log_item_t *); 74 - void (*iop_unpin)(xfs_log_item_t *, int remove); 71 + void (*iop_size)(struct xfs_log_item *, int *, int *); 72 + void (*iop_format)(struct xfs_log_item *, struct xfs_log_vec *); 73 + void (*iop_pin)(struct xfs_log_item *); 74 + void (*iop_unpin)(struct xfs_log_item *, int remove); 75 75 uint (*iop_push)(struct xfs_log_item *, struct list_head *); 76 76 void (*iop_committing)(struct xfs_log_item *, xfs_lsn_t commit_lsn); 77 77 void (*iop_release)(struct xfs_log_item *); 78 - xfs_lsn_t (*iop_committed)(xfs_log_item_t *, xfs_lsn_t); 79 - void (*iop_error)(xfs_log_item_t *, xfs_buf_t *); 78 + xfs_lsn_t (*iop_committed)(struct xfs_log_item *, xfs_lsn_t); 79 + void (*iop_error)(struct xfs_log_item *, xfs_buf_t *); 80 80 }; 81 81 82 82 /*
+22 -22
fs/xfs/xfs_trans_ail.c
··· 75 75 * Return a pointer to the last item in the AIL. If the AIL is empty, then 76 76 * return NULL. 77 77 */ 78 - static xfs_log_item_t * 78 + static struct xfs_log_item * 79 79 xfs_ail_max( 80 80 struct xfs_ail *ailp) 81 81 { 82 82 if (list_empty(&ailp->ail_head)) 83 83 return NULL; 84 84 85 - return list_entry(ailp->ail_head.prev, xfs_log_item_t, li_ail); 85 + return list_entry(ailp->ail_head.prev, struct xfs_log_item, li_ail); 86 86 } 87 87 88 88 /* 89 89 * Return a pointer to the item which follows the given item in the AIL. If 90 90 * the given item is the last item in the list, then return NULL. 91 91 */ 92 - static xfs_log_item_t * 92 + static struct xfs_log_item * 93 93 xfs_ail_next( 94 - struct xfs_ail *ailp, 95 - xfs_log_item_t *lip) 94 + struct xfs_ail *ailp, 95 + struct xfs_log_item *lip) 96 96 { 97 97 if (lip->li_ail.next == &ailp->ail_head) 98 98 return NULL; 99 99 100 - return list_first_entry(&lip->li_ail, xfs_log_item_t, li_ail); 100 + return list_first_entry(&lip->li_ail, struct xfs_log_item, li_ail); 101 101 } 102 102 103 103 /* ··· 110 110 */ 111 111 xfs_lsn_t 112 112 xfs_ail_min_lsn( 113 - struct xfs_ail *ailp) 113 + struct xfs_ail *ailp) 114 114 { 115 - xfs_lsn_t lsn = 0; 116 - xfs_log_item_t *lip; 115 + xfs_lsn_t lsn = 0; 116 + struct xfs_log_item *lip; 117 117 118 118 spin_lock(&ailp->ail_lock); 119 119 lip = xfs_ail_min(ailp); ··· 129 129 */ 130 130 static xfs_lsn_t 131 131 xfs_ail_max_lsn( 132 - struct xfs_ail *ailp) 132 + struct xfs_ail *ailp) 133 133 { 134 - xfs_lsn_t lsn = 0; 135 - xfs_log_item_t *lip; 134 + xfs_lsn_t lsn = 0; 135 + struct xfs_log_item *lip; 136 136 137 137 spin_lock(&ailp->ail_lock); 138 138 lip = xfs_ail_max(ailp); ··· 217 217 * ascending traversal. Pass a @lsn of zero to initialise the cursor to the 218 218 * first item in the AIL. Returns NULL if the list is empty. 219 219 */ 220 - xfs_log_item_t * 220 + struct xfs_log_item * 221 221 xfs_trans_ail_cursor_first( 222 222 struct xfs_ail *ailp, 223 223 struct xfs_ail_cursor *cur, 224 224 xfs_lsn_t lsn) 225 225 { 226 - xfs_log_item_t *lip; 226 + struct xfs_log_item *lip; 227 227 228 228 xfs_trans_ail_cursor_init(ailp, cur); 229 229 ··· 249 249 struct xfs_ail *ailp, 250 250 xfs_lsn_t lsn) 251 251 { 252 - xfs_log_item_t *lip; 252 + struct xfs_log_item *lip; 253 253 254 254 list_for_each_entry_reverse(lip, &ailp->ail_head, li_ail) { 255 255 if (XFS_LSN_CMP(lip->li_lsn, lsn) <= 0) ··· 328 328 */ 329 329 static void 330 330 xfs_ail_delete( 331 - struct xfs_ail *ailp, 332 - xfs_log_item_t *lip) 331 + struct xfs_ail *ailp, 332 + struct xfs_log_item *lip) 333 333 { 334 334 xfs_ail_check(ailp, lip); 335 335 list_del(&lip->li_ail); ··· 365 365 { 366 366 xfs_mount_t *mp = ailp->ail_mount; 367 367 struct xfs_ail_cursor cur; 368 - xfs_log_item_t *lip; 368 + struct xfs_log_item *lip; 369 369 xfs_lsn_t lsn; 370 370 xfs_lsn_t target; 371 371 long tout; ··· 620 620 */ 621 621 void 622 622 xfs_ail_push( 623 - struct xfs_ail *ailp, 624 - xfs_lsn_t threshold_lsn) 623 + struct xfs_ail *ailp, 624 + xfs_lsn_t threshold_lsn) 625 625 { 626 - xfs_log_item_t *lip; 626 + struct xfs_log_item *lip; 627 627 628 628 lip = xfs_ail_min(ailp); 629 629 if (!lip || XFS_FORCED_SHUTDOWN(ailp->ail_mount) || ··· 708 708 int nr_items, 709 709 xfs_lsn_t lsn) __releases(ailp->ail_lock) 710 710 { 711 - xfs_log_item_t *mlip; 711 + struct xfs_log_item *mlip; 712 712 int mlip_changed = 0; 713 713 int i; 714 714 LIST_HEAD(tmp);