Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe2330f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the xfs_log_item_t typedef 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b3b14aac

fs/xfs/xfs_buf_item.c

+3 −3
Original line number Diff line number Diff line
@@ -982,9 +982,9 @@ xfs_buf_item_relse( 
 */

void

xfs_buf_attach_iodone(

	xfs_buf_t	*bp,

	void		(*cb)(xfs_buf_t *, xfs_log_item_t *),

	xfs_log_item_t	*lip)

	struct xfs_buf		*bp,

	void			(*cb)(struct xfs_buf *, struct xfs_log_item *),

	struct xfs_log_item	*lip)

{

	ASSERT(xfs_buf_islocked(bp));

fs/xfs/xfs_buf_item.h

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct xfs_buf_log_item; 
 * locked, and which 128 byte chunks of the buffer are dirty.

 */

struct xfs_buf_log_item {

	xfs_log_item_t		bli_item;	/* common item structure */

	struct xfs_log_item	bli_item;	/* common item structure */

	struct xfs_buf		*bli_buf;	/* real buffer pointer */

	unsigned int		bli_flags;	/* misc flags */

	unsigned int		bli_recur;	/* lock recursion count */
@@ -55,8 +55,8 @@ bool xfs_buf_item_put(struct xfs_buf_log_item *); 
void	xfs_buf_item_log(struct xfs_buf_log_item *, uint, uint);

bool	xfs_buf_item_dirty_format(struct xfs_buf_log_item *);

void	xfs_buf_attach_iodone(struct xfs_buf *,

			      void(*)(struct xfs_buf *, xfs_log_item_t *),

			      xfs_log_item_t *);

			      void(*)(struct xfs_buf *, struct xfs_log_item *),

			      struct xfs_log_item *);

void	xfs_buf_iodone_callbacks(struct xfs_buf *);

void	xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *);

bool	xfs_buf_resubmit_failed_buffers(struct xfs_buf *,

fs/xfs/xfs_dquot_item.h

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ struct xfs_mount; 
struct xfs_qoff_logitem;



typedef struct xfs_dq_logitem {

	xfs_log_item_t		 qli_item;	   /* common portion */

	struct xfs_log_item	 qli_item;	   /* common portion */

	struct xfs_dquot	*qli_dquot;	   /* dquot ptr */

	xfs_lsn_t		 qli_flush_lsn;	   /* lsn at last flush */

} xfs_dq_logitem_t;



typedef struct xfs_qoff_logitem {

	xfs_log_item_t		 qql_item;	/* common portion */

	struct xfs_log_item	 qql_item;	/* common portion */

	struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */

	unsigned int		qql_flags;

} xfs_qoff_logitem_t;

fs/xfs/xfs_extfree_item.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct kmem_zone; 
 * AIL, so at this point both the EFI and EFD are freed.

 */

typedef struct xfs_efi_log_item {

	xfs_log_item_t		efi_item;

	struct xfs_log_item	efi_item;

	atomic_t		efi_refcount;

	atomic_t		efi_next_extent;

	unsigned long		efi_flags;	/* misc flags */
@@ -64,7 +64,7 @@ typedef struct xfs_efi_log_item { 
 * have been freed.

 */

typedef struct xfs_efd_log_item {

	xfs_log_item_t		efd_item;

	struct xfs_log_item	efd_item;

	xfs_efi_log_item_t	*efd_efip;

	uint			efd_next_extent;

	xfs_efd_log_format_t	efd_format;

fs/xfs/xfs_inode.c

+6 −6
Original line number Diff line number Diff line
@@ -441,12 +441,12 @@ xfs_lock_inumorder(int lock_mode, int subclass) 
 */

static void

xfs_lock_inodes(

	xfs_inode_t	**ips,

	struct xfs_inode	**ips,

	int			inodes,

	uint			lock_mode)

{

	int			attempts = 0, i, j, try_lock;

	xfs_log_item_t	*lp;

	struct xfs_log_item	*lp;



	/*

	 * Currently supports between 2 and 5 inodes with exclusive locking.  We
@@ -551,7 +551,7 @@ xfs_lock_two_inodes( 
	struct xfs_inode	*temp;

	uint			mode_temp;

	int			attempts = 0;

	xfs_log_item_t		*lp;

	struct xfs_log_item	*lp;



	ASSERT(hweight32(ip0_mode) == 1);

	ASSERT(hweight32(ip1_mode) == 1);