Commit e8b65083 authored by Nathan Scott's avatar Nathan Scott

[XFS] Remove assertion that we do not hold a lock - no lock ownership state available.

SGI Modid: 2.5.x-xfs:slinx:162250a
parent 6c39f81d
...@@ -757,7 +757,6 @@ xfs_qm_idtodq( ...@@ -757,7 +757,6 @@ xfs_qm_idtodq(
} }
*O_dqpp = dqp; *O_dqpp = dqp;
ASSERT(! XFS_DQ_IS_LOCKED(dqp));
return (0); return (0);
error0: error0:
...@@ -1006,7 +1005,6 @@ xfs_qm_dqget( ...@@ -1006,7 +1005,6 @@ xfs_qm_dqget(
/* /*
* Dquot lock comes after hashlock in the lock ordering * Dquot lock comes after hashlock in the lock ordering
*/ */
ASSERT(! XFS_DQ_IS_LOCKED(dqp));
if (ip) { if (ip) {
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);
if (! XFS_IS_DQTYPE_ON(mp, type)) { if (! XFS_IS_DQTYPE_ON(mp, type)) {
......
...@@ -806,7 +806,6 @@ xfs_qm_dqattach_one( ...@@ -806,7 +806,6 @@ xfs_qm_dqattach_one(
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
if (! dolock) { if (! dolock) {
xfs_dqunlock(dqp); xfs_dqunlock(dqp);
ASSERT(!udqhint || !XFS_DQ_IS_LOCKED(udqhint));
goto done; goto done;
} }
if (! udqhint) if (! udqhint)
...@@ -814,7 +813,6 @@ xfs_qm_dqattach_one( ...@@ -814,7 +813,6 @@ xfs_qm_dqattach_one(
ASSERT(udqhint); ASSERT(udqhint);
ASSERT(dolock); ASSERT(dolock);
ASSERT(! XFS_DQ_IS_LOCKED(udqhint));
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
if (! xfs_qm_dqlock_nowait(udqhint)) { if (! xfs_qm_dqlock_nowait(udqhint)) {
xfs_dqunlock(dqp); xfs_dqunlock(dqp);
...@@ -826,14 +824,10 @@ xfs_qm_dqattach_one( ...@@ -826,14 +824,10 @@ xfs_qm_dqattach_one(
if (udqhint) { if (udqhint) {
if (dolock) if (dolock)
ASSERT(XFS_DQ_IS_LOCKED(udqhint)); ASSERT(XFS_DQ_IS_LOCKED(udqhint));
else
ASSERT(! XFS_DQ_IS_LOCKED(udqhint));
} }
if (! error) { if (! error) {
if (dolock) if (dolock)
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
else
ASSERT(! XFS_DQ_IS_LOCKED(dqp));
} }
#endif #endif
return (error); return (error);
...@@ -860,9 +854,6 @@ xfs_qm_dqattach_grouphint( ...@@ -860,9 +854,6 @@ xfs_qm_dqattach_grouphint(
if (locked) { if (locked) {
ASSERT(XFS_DQ_IS_LOCKED(udq)); ASSERT(XFS_DQ_IS_LOCKED(udq));
ASSERT(XFS_DQ_IS_LOCKED(gdq)); ASSERT(XFS_DQ_IS_LOCKED(gdq));
} else {
ASSERT(! XFS_DQ_IS_LOCKED(udq));
ASSERT(! XFS_DQ_IS_LOCKED(gdq));
} }
#endif #endif
if (! locked) if (! locked)
...@@ -890,15 +881,12 @@ xfs_qm_dqattach_grouphint( ...@@ -890,15 +881,12 @@ xfs_qm_dqattach_grouphint(
*/ */
xfs_qm_dqrele(tmp); xfs_qm_dqrele(tmp);
ASSERT(! XFS_DQ_IS_LOCKED(udq));
ASSERT(! XFS_DQ_IS_LOCKED(gdq));
xfs_dqlock(udq); xfs_dqlock(udq);
xfs_dqlock(gdq); xfs_dqlock(gdq);
} else { } else {
ASSERT(XFS_DQ_IS_LOCKED(udq)); ASSERT(XFS_DQ_IS_LOCKED(udq));
if (! locked) { if (! locked) {
ASSERT(! XFS_DQ_IS_LOCKED(gdq));
xfs_dqlock(gdq); xfs_dqlock(gdq);
} }
} }
...@@ -1006,14 +994,10 @@ xfs_qm_dqattach( ...@@ -1006,14 +994,10 @@ xfs_qm_dqattach(
if (ip->i_udquot) { if (ip->i_udquot) {
if (flags & XFS_QMOPT_DQLOCK) if (flags & XFS_QMOPT_DQLOCK)
ASSERT(XFS_DQ_IS_LOCKED(ip->i_udquot)); ASSERT(XFS_DQ_IS_LOCKED(ip->i_udquot));
else
ASSERT(! XFS_DQ_IS_LOCKED(ip->i_udquot));
} }
if (ip->i_gdquot) { if (ip->i_gdquot) {
if (flags & XFS_QMOPT_DQLOCK) if (flags & XFS_QMOPT_DQLOCK)
ASSERT(XFS_DQ_IS_LOCKED(ip->i_gdquot)); ASSERT(XFS_DQ_IS_LOCKED(ip->i_gdquot));
else
ASSERT(! XFS_DQ_IS_LOCKED(ip->i_gdquot));
} }
if (XFS_IS_UQUOTA_ON(mp)) if (XFS_IS_UQUOTA_ON(mp))
ASSERT(ip->i_udquot); ASSERT(ip->i_udquot);
......
...@@ -835,13 +835,6 @@ xfs_trans_reserve_quota_nblks( ...@@ -835,13 +835,6 @@ xfs_trans_reserve_quota_nblks(
ASSERT(ip->i_ino != mp->m_sb.sb_uquotino); ASSERT(ip->i_ino != mp->m_sb.sb_uquotino);
ASSERT(ip->i_ino != mp->m_sb.sb_gquotino); ASSERT(ip->i_ino != mp->m_sb.sb_gquotino);
#ifdef QUOTADEBUG
if (ip->i_udquot)
ASSERT(! XFS_DQ_IS_LOCKED(ip->i_udquot));
if (ip->i_gdquot)
ASSERT(! XFS_DQ_IS_LOCKED(ip->i_gdquot));
#endif
ASSERT(XFS_ISLOCKED_INODE_EXCL(ip)); ASSERT(XFS_ISLOCKED_INODE_EXCL(ip));
ASSERT(XFS_IS_QUOTA_RUNNING(ip->i_mount)); ASSERT(XFS_IS_QUOTA_RUNNING(ip->i_mount));
ASSERT((type & ~XFS_QMOPT_FORCE_RES) == XFS_TRANS_DQ_RES_RTBLKS || ASSERT((type & ~XFS_QMOPT_FORCE_RES) == XFS_TRANS_DQ_RES_RTBLKS ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment