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

Commit ee2a4f7c authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Fix an intermittent pquota panic caused by dodgey quota flags to an 


umount dquot flush call.

SGI-PV: 946444
SGI-Modid: xfs-linux-melb:xfs-kern:24680a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 3ddb8fa9

fs/xfs/quota/xfs_qm.c

+6 −4
Original line number Diff line number Diff line
@@ -1920,9 +1920,7 @@ xfs_qm_quotacheck( 
	 * at this point (because we intentionally didn't in dqget_noattach).

	 */

	if (error) {

		xfs_qm_dqpurge_all(mp,

				   XFS_QMOPT_UQUOTA|XFS_QMOPT_GQUOTA|

				   XFS_QMOPT_PQUOTA|XFS_QMOPT_QUOTAOFF);

		xfs_qm_dqpurge_all(mp, XFS_QMOPT_QUOTALL | XFS_QMOPT_QUOTAOFF);

		goto error_return;

	}

	/*
@@ -2745,6 +2743,7 @@ xfs_qm_vop_dqattach_and_dqmod_newinode( 
		xfs_dqunlock(udqp);

		ASSERT(ip->i_udquot == NULL);

		ip->i_udquot = udqp;

		ASSERT(XFS_IS_UQUOTA_ON(tp->t_mountp));

		ASSERT(ip->i_d.di_uid == be32_to_cpu(udqp->q_core.d_id));

		xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1);

	}
@@ -2754,7 +2753,10 @@ xfs_qm_vop_dqattach_and_dqmod_newinode( 
		xfs_dqunlock(gdqp);

		ASSERT(ip->i_gdquot == NULL);

		ip->i_gdquot = gdqp;

		ASSERT(ip->i_d.di_gid == be32_to_cpu(gdqp->q_core.d_id));

		ASSERT(XFS_IS_OQUOTA_ON(tp->t_mountp));

		ASSERT((XFS_IS_GQUOTA_ON(tp->t_mountp) ?

			ip->i_d.di_gid : ip->i_d.di_projid) ==

				be32_to_cpu(gdqp->q_core.d_id));

		xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);

	}

}

fs/xfs/xfs_mount.c

+1 −2
Original line number Diff line number Diff line
@@ -1077,8 +1077,7 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr) 


	xfs_iflush_all(mp);



	XFS_QM_DQPURGEALL(mp,

		XFS_QMOPT_UQUOTA | XFS_QMOPT_GQUOTA | XFS_QMOPT_UMOUNTING);

	XFS_QM_DQPURGEALL(mp, XFS_QMOPT_QUOTALL | XFS_QMOPT_UMOUNTING);



	/*

	 * Flush out the log synchronously so that we know for sure