diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-02-09 08:39:24 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@brick.lst.de> | 2009-02-09 08:39:24 +0100 |
| commit | 7201813bf55cc06e6a7405831f63df96ee7842e7 (patch) | |
| tree | 12eadd4e19c3defe7bdb8c054cd2b4d66bb5f379 /fs/xfs | |
| parent | e249458220c9799fe94573abd341d29c83579671 (diff) | |
| download | linux-7201813bf55cc06e6a7405831f63df96ee7842e7.tar.gz linux-7201813bf55cc06e6a7405831f63df96ee7842e7.tar.bz2 linux-7201813bf55cc06e6a7405831f63df96ee7842e7.zip | |
xfs: use mutex_is_locked in XFS_DQ_IS_LOCKED
Now that we have a helper to test if a mutex is held use it instead of our
own little hacks.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/quota/xfs_dquot.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/xfs/quota/xfs_dquot.h b/fs/xfs/quota/xfs_dquot.h index d443e93b4331..d1f726e0e5a4 100644 --- a/fs/xfs/quota/xfs_dquot.h +++ b/fs/xfs/quota/xfs_dquot.h @@ -109,19 +109,6 @@ enum { #define XFS_DQHOLD(dqp) ((dqp)->q_nrefs++) -#ifdef DEBUG -static inline int -XFS_DQ_IS_LOCKED(xfs_dquot_t *dqp) -{ - if (mutex_trylock(&dqp->q_qlock)) { - mutex_unlock(&dqp->q_qlock); - return 0; - } - return 1; -} -#endif - - /* * Manage the q_flush completion queue embedded in the dquot. This completion * queue synchronizes processes attempting to flush the in-core dquot back to @@ -142,6 +129,7 @@ static inline void xfs_dqfunlock(xfs_dquot_t *dqp) complete(&dqp->q_flush); } +#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) |