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

Commit fdce40c8 authored by Pavel Reichl's avatar Pavel Reichl Committed by Greg Kroah-Hartman
Browse files

xfs: remove the xfs_qoff_logitem_t typedef 



commit d0bdfb106907e4a3ef4f25f6d27e392abf41f3a0 upstream.

Signed-off-by: default avatarPavel Reichl <preichl@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: fix a comment]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 926ddf78

fs/xfs/libxfs/xfs_trans_resv.c

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ xfs_calc_qm_dqalloc_reservation( 


/*

 * Turning off quotas.

 *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2

 *    the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2

 *    the superblock for the quota flags: sector size

 */

STATIC uint
@@ -813,7 +813,7 @@ xfs_calc_qm_quotaoff_reservation( 


/*

 * End of turning off quotas.

 *    the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2

 *    the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2

 */

STATIC uint

xfs_calc_qm_quotaoff_end_reservation(void)

fs/xfs/xfs_dquot_item.h

+15 −13
Original line number Diff line number Diff line
@@ -17,19 +17,21 @@ struct xfs_dq_logitem { 
	xfs_lsn_t		qli_flush_lsn;	/* lsn at last flush */

};



typedef struct xfs_qoff_logitem {

struct xfs_qoff_logitem {

	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;

};





extern void		   xfs_qm_dquot_logitem_init(struct xfs_dquot *);

extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init(struct xfs_mount *,

					struct xfs_qoff_logitem *, uint);

extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item(struct xfs_trans *,

					struct xfs_qoff_logitem *, uint);

extern void		   xfs_trans_log_quotaoff_item(struct xfs_trans *,

					struct xfs_qoff_logitem *);

void xfs_qm_dquot_logitem_init(struct xfs_dquot *dqp);

struct xfs_qoff_logitem	*xfs_qm_qoff_logitem_init(struct xfs_mount *mp,

		struct xfs_qoff_logitem *start,

		uint flags);

struct xfs_qoff_logitem	*xfs_trans_get_qoff_item(struct xfs_trans *tp,

		struct xfs_qoff_logitem *startqoff,

		uint flags);

void xfs_trans_log_quotaoff_item(struct xfs_trans *tp,

		struct xfs_qoff_logitem *qlp);



#endif	/* __XFS_DQUOT_ITEM_H__ */

fs/xfs/xfs_qm_syscalls.c

+16 −13
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ 
#include "xfs_qm.h"

#include "xfs_icache.h"



STATIC int	xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint);

STATIC int	xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *,

					uint);

STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp,

					struct xfs_qoff_logitem **qoffstartp,

					uint flags);

STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp,

					struct xfs_qoff_logitem *startqoff,

					uint flags);



/*

 * Turn off quota accounting and/or enforcement for all udquots and/or
@@ -40,7 +43,7 @@ xfs_qm_scall_quotaoff( 
	uint			dqtype;

	int			error;

	uint			inactivate_flags;

	xfs_qoff_logitem_t	*qoffstart;

	struct xfs_qoff_logitem	*qoffstart;



	/*

	 * No file system can have quotas enabled on disk but not in core.
@@ -540,13 +543,13 @@ xfs_qm_scall_setqlim( 


STATIC int

xfs_qm_log_quotaoff_end(

	xfs_mount_t		*mp,

	xfs_qoff_logitem_t	*startqoff,

	struct xfs_mount	*mp,

	struct xfs_qoff_logitem	*startqoff,

	uint			flags)

{

	xfs_trans_t		*tp;

	struct xfs_trans	*tp;

	int			error;

	xfs_qoff_logitem_t	*qoffi;

	struct xfs_qoff_logitem	*qoffi;



	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp);

	if (error)
@@ -568,13 +571,13 @@ xfs_qm_log_quotaoff_end( 


STATIC int

xfs_qm_log_quotaoff(

	xfs_mount_t	       *mp,

	xfs_qoff_logitem_t     **qoffstartp,

	struct xfs_mount	*mp,

	struct xfs_qoff_logitem	**qoffstartp,

	uint			flags)

{

	xfs_trans_t	       *tp;

	struct xfs_trans	*tp;

	int			error;

	xfs_qoff_logitem_t     *qoffi;

	struct xfs_qoff_logitem	*qoffi;



	*qoffstartp = NULL;

fs/xfs/xfs_trans_dquot.c

+6 −6
Original line number Diff line number Diff line
@@ -824,13 +824,13 @@ xfs_trans_reserve_quota_nblks( 
/*

 * This routine is called to allocate a quotaoff log item.

 */

xfs_qoff_logitem_t *

struct xfs_qoff_logitem *

xfs_trans_get_qoff_item(

	xfs_trans_t		*tp,

	xfs_qoff_logitem_t	*startqoff,

	struct xfs_trans	*tp,

	struct xfs_qoff_logitem	*startqoff,

	uint			flags)

{

	xfs_qoff_logitem_t	*q;

	struct xfs_qoff_logitem	*q;



	ASSERT(tp != NULL);
@@ -852,8 +852,8 @@ xfs_trans_get_qoff_item( 
 */

void

xfs_trans_log_quotaoff_item(

	xfs_trans_t		*tp,

	xfs_qoff_logitem_t	*qlp)

	struct xfs_trans	*tp,

	struct xfs_qoff_logitem	*qlp)

{

	tp->t_flags |= XFS_TRANS_DIRTY;

	set_bit(XFS_LI_DIRTY, &qlp->qql_item.li_flags);