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

Commit 74457cf4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove xfs_dqmarker 



The xfs_dqmarker structure does not need to exist anymore. Move the
remaining flags field out of it and remove the structure altogether.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
parent 3a8406f6

fs/xfs/quota/xfs_dquot.h

+1 −20
Original line number Diff line number Diff line
@@ -42,22 +42,11 @@ typedef struct xfs_dqhash { 
struct xfs_mount;

struct xfs_trans;



/*

 * This is the marker which is designed to occupy the first few

 * bytes of the xfs_dquot_t structure. Even inside this, the freelist pointers

 * must come first.

 * This serves as the marker ("sentinel") when we have to restart list

 * iterations because of locking considerations.

 */

typedef struct xfs_dqmarker {

	uint		 dqm_flags;	/* various flags (XFS_DQ_*) */

} xfs_dqmarker_t;



/*

 * The incore dquot structure

 */

typedef struct xfs_dquot {

	xfs_dqmarker_t	 q_lists;	/* list ptrs, q_flags (marker) */

	uint		 dq_flags;	/* various flags (XFS_DQ_*) */

	struct list_head q_freelist;	/* global free list of dquots */

	struct list_head q_mplist;	/* mount's list of dquots */

	struct list_head q_hashlist;	/* gloabl hash list of dquots */
@@ -81,13 +70,6 @@ typedef struct xfs_dquot { 
	wait_queue_head_t q_pinwait;	/* dquot pinning wait queue */

} xfs_dquot_t;





#define dq_flnext	q_lists.dqm_flnext

#define dq_flprev	q_lists.dqm_flprev

#define dq_mplist	q_lists.dqm_mplist

#define dq_hashlist	q_lists.dqm_hashlist

#define dq_flags	q_lists.dqm_flags



/*

 * Lock hierarchy for q_qlock:

 *	XFS_QLOCK_NORMAL is the implicit default,
@@ -121,7 +103,6 @@ static inline void xfs_dqfunlock(xfs_dquot_t *dqp) 
}



#define XFS_DQ_IS_LOCKED(dqp)	(mutex_is_locked(&((dqp)->q_qlock)))

#define XFS_DQ_IS_ON_FREELIST(dqp)  ((dqp)->dq_flnext != (dqp))

#define XFS_DQ_IS_DIRTY(dqp)	((dqp)->dq_flags & XFS_DQ_DIRTY)

#define XFS_QM_ISUDQ(dqp)	((dqp)->dq_flags & XFS_DQ_USER)

#define XFS_QM_ISPDQ(dqp)	((dqp)->dq_flags & XFS_DQ_PROJ)

fs/xfs/quota/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ struct mutex qcheck_lock; 
}



typedef struct dqtest {

	xfs_dqmarker_t	q_lists;

	uint		 dq_flags;	/* various flags (XFS_DQ_*) */

	struct list_head q_hashlist;

	xfs_dqhash_t	*q_hash;	/* the hashchain header */

	xfs_mount_t	*q_mount;	/* filesystem this relates to */