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

xfs: remove the xfs_qoff_logitem_t typedef

Signed-off-by: Pavel Reichl <preichl@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
[darrick: fix a comment]
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

authored by

Pavel Reichl and committed by
Darrick J. Wong
d0bdfb10 fd8b81db

+39 -34
+2 -2
fs/xfs/libxfs/xfs_trans_resv.c
··· 742 742 743 743 /* 744 744 * Turning off quotas. 745 - * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 745 + * the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 746 746 * the superblock for the quota flags: sector size 747 747 */ 748 748 STATIC uint ··· 755 755 756 756 /* 757 757 * End of turning off quotas. 758 - * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 758 + * the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 759 759 */ 760 760 STATIC uint 761 761 xfs_calc_qm_quotaoff_end_reservation(void)
+15 -13
fs/xfs/xfs_dquot_item.h
··· 12 12 struct xfs_qoff_logitem; 13 13 14 14 struct xfs_dq_logitem { 15 - struct xfs_log_item qli_item; /* common portion */ 15 + struct xfs_log_item qli_item; /* common portion */ 16 16 struct xfs_dquot *qli_dquot; /* dquot ptr */ 17 - xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ 17 + xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ 18 18 }; 19 19 20 - typedef struct xfs_qoff_logitem { 21 - struct xfs_log_item qql_item; /* common portion */ 22 - struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ 20 + struct xfs_qoff_logitem { 21 + struct xfs_log_item qql_item; /* common portion */ 22 + struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ 23 23 unsigned int qql_flags; 24 - } xfs_qoff_logitem_t; 24 + }; 25 25 26 26 27 - extern void xfs_qm_dquot_logitem_init(struct xfs_dquot *); 28 - extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init(struct xfs_mount *, 29 - struct xfs_qoff_logitem *, uint); 30 - extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item(struct xfs_trans *, 31 - struct xfs_qoff_logitem *, uint); 32 - extern void xfs_trans_log_quotaoff_item(struct xfs_trans *, 33 - struct xfs_qoff_logitem *); 27 + void xfs_qm_dquot_logitem_init(struct xfs_dquot *dqp); 28 + struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init(struct xfs_mount *mp, 29 + struct xfs_qoff_logitem *start, 30 + uint flags); 31 + struct xfs_qoff_logitem *xfs_trans_get_qoff_item(struct xfs_trans *tp, 32 + struct xfs_qoff_logitem *startqoff, 33 + uint flags); 34 + void xfs_trans_log_quotaoff_item(struct xfs_trans *tp, 35 + struct xfs_qoff_logitem *qlp); 34 36 35 37 #endif /* __XFS_DQUOT_ITEM_H__ */
+16 -13
fs/xfs/xfs_qm_syscalls.c
··· 19 19 #include "xfs_qm.h" 20 20 #include "xfs_icache.h" 21 21 22 - STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); 23 - STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, 24 - uint); 22 + STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp, 23 + struct xfs_qoff_logitem **qoffstartp, 24 + uint flags); 25 + STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp, 26 + struct xfs_qoff_logitem *startqoff, 27 + uint flags); 25 28 26 29 /* 27 30 * Turn off quota accounting and/or enforcement for all udquots and/or ··· 43 40 uint dqtype; 44 41 int error; 45 42 uint inactivate_flags; 46 - xfs_qoff_logitem_t *qoffstart; 43 + struct xfs_qoff_logitem *qoffstart; 47 44 48 45 /* 49 46 * No file system can have quotas enabled on disk but not in core. ··· 543 540 544 541 STATIC int 545 542 xfs_qm_log_quotaoff_end( 546 - xfs_mount_t *mp, 547 - xfs_qoff_logitem_t *startqoff, 543 + struct xfs_mount *mp, 544 + struct xfs_qoff_logitem *startqoff, 548 545 uint flags) 549 546 { 550 - xfs_trans_t *tp; 547 + struct xfs_trans *tp; 551 548 int error; 552 - xfs_qoff_logitem_t *qoffi; 549 + struct xfs_qoff_logitem *qoffi; 553 550 554 551 error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp); 555 552 if (error) ··· 571 568 572 569 STATIC int 573 570 xfs_qm_log_quotaoff( 574 - xfs_mount_t *mp, 575 - xfs_qoff_logitem_t **qoffstartp, 576 - uint flags) 571 + struct xfs_mount *mp, 572 + struct xfs_qoff_logitem **qoffstartp, 573 + uint flags) 577 574 { 578 - xfs_trans_t *tp; 575 + struct xfs_trans *tp; 579 576 int error; 580 - xfs_qoff_logitem_t *qoffi; 577 + struct xfs_qoff_logitem *qoffi; 581 578 582 579 *qoffstartp = NULL; 583 580
+6 -6
fs/xfs/xfs_trans_dquot.c
··· 824 824 /* 825 825 * This routine is called to allocate a quotaoff log item. 826 826 */ 827 - xfs_qoff_logitem_t * 827 + struct xfs_qoff_logitem * 828 828 xfs_trans_get_qoff_item( 829 - xfs_trans_t *tp, 830 - xfs_qoff_logitem_t *startqoff, 829 + struct xfs_trans *tp, 830 + struct xfs_qoff_logitem *startqoff, 831 831 uint flags) 832 832 { 833 - xfs_qoff_logitem_t *q; 833 + struct xfs_qoff_logitem *q; 834 834 835 835 ASSERT(tp != NULL); 836 836 ··· 852 852 */ 853 853 void 854 854 xfs_trans_log_quotaoff_item( 855 - xfs_trans_t *tp, 856 - xfs_qoff_logitem_t *qlp) 855 + struct xfs_trans *tp, 856 + struct xfs_qoff_logitem *qlp) 857 857 { 858 858 tp->t_flags |= XFS_TRANS_DIRTY; 859 859 set_bit(XFS_LI_DIRTY, &qlp->qql_item.li_flags);