Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

2 files changed, 13 insertions, 9 deletions

diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c
index 2f69822344e5..2ec6b441849c 100644
--- a/fs/xfs/quota/xfs_dquot_item.c
+++ b/fs/xfs/quota/xfs_dquot_item.c
@@ -239,7 +239,7 @@ xfs_qm_dquot_logitem_pushbuf(
          * trying to duplicate our effort.
          */
         ASSERT(qip->qli_pushbuf_flag != 0);
-        ASSERT(qip->qli_push_owner == get_thread_id());
+        ASSERT(qip->qli_push_owner == current_pid());
 
         /*
          * If flushlock isn't locked anymore, chances are that the
@@ -333,7 +333,7 @@ xfs_qm_dquot_logitem_trylock(
                         qip->qli_pushbuf_flag = 1;
                         ASSERT(qip->qli_format.qlf_blkno == dqp->q_blkno);
 #ifdef DEBUG
-                        qip->qli_push_owner = get_thread_id();
+                        qip->qli_push_owner = current_pid();
 #endif
                         /*
                          * The dquot is left locked.
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index bb6991a7a617..7dcdd0640c32 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -1392,11 +1392,12 @@ xfs_qm_qino_alloc(
 {
         xfs_trans_t     *tp;
         int             error;
-        unsigned long s;
+        unsigned long   s;
         cred_t          zerocr;
+        xfs_inode_t     zeroino;
         int             committed;
 
-        tp = xfs_trans_alloc(mp,XFS_TRANS_QM_QINOCREATE);
+        tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QINOCREATE);
         if ((error = xfs_trans_reserve(tp,
                                       XFS_QM_QINOCREATE_SPACE_RES(mp),
                                       XFS_CREATE_LOG_RES(mp), 0,
@@ -1406,8 +1407,9 @@ xfs_qm_qino_alloc(
                 return (error);
         }
         memset(&zerocr, 0, sizeof(zerocr));
+        memset(&zeroino, 0, sizeof(zeroino));
 
-        if ((error = xfs_dir_ialloc(&tp, mp->m_rootip, S_IFREG, 1, 0,
+        if ((error = xfs_dir_ialloc(&tp, &zeroino, S_IFREG, 1, 0,
                                    &zerocr, 0, 1, ip, &committed))) {
                 xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES |
                                  XFS_TRANS_ABORT);
@@ -1918,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;
         }
         /*
@@ -2743,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);
         }
@@ -2752,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);
         }
 }