1 files changed, 12 insertions, 12 deletions

diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index d31cce1165c5..021934a3d456 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -192,8 +192,8 @@ xfs_qm_destroy(
                 xfs_qm_list_destroy(&(xqm->qm_usr_dqhtable[i]));
                 xfs_qm_list_destroy(&(xqm->qm_grp_dqhtable[i]));
         }
-        kmem_free(xqm->qm_usr_dqhtable, hsize * sizeof(xfs_dqhash_t));
-        kmem_free(xqm->qm_grp_dqhtable, hsize * sizeof(xfs_dqhash_t));
+        kmem_free(xqm->qm_usr_dqhtable);
+        kmem_free(xqm->qm_grp_dqhtable);
         xqm->qm_usr_dqhtable = NULL;
         xqm->qm_grp_dqhtable = NULL;
         xqm->qm_dqhashmask = 0;
@@ -201,7 +201,7 @@ xfs_qm_destroy(
 #ifdef DEBUG
         mutex_destroy(&qcheck_lock);
 #endif
-        kmem_free(xqm, sizeof(xfs_qm_t));
+        kmem_free(xqm);
 }
 
 /*
@@ -445,11 +445,11 @@ xfs_qm_unmount_quotas(
                 }
         }
         if (uqp) {
-                 XFS_PURGE_INODE(uqp);
+                 IRELE(uqp);
                  mp->m_quotainfo->qi_uquotaip = NULL;
         }
         if (gqp) {
-                XFS_PURGE_INODE(gqp);
+                IRELE(gqp);
                 mp->m_quotainfo->qi_gquotaip = NULL;
         }
 out:
@@ -631,7 +631,7 @@ xfs_qm_dqpurge_int(
                  * freelist in INACTIVE state.
                  */
                 nextdqp = dqp->MPL_NEXT;
-                nmisses += xfs_qm_dqpurge(dqp, flags);
+                nmisses += xfs_qm_dqpurge(dqp);
                 dqp = nextdqp;
         }
         xfs_qm_mplist_unlock(mp);
@@ -1134,7 +1134,7 @@ xfs_qm_init_quotainfo(
          * and change the superblock accordingly.
          */
         if ((error = xfs_qm_init_quotainos(mp))) {
-                kmem_free(qinf, sizeof(xfs_quotainfo_t));
+                kmem_free(qinf);
                 mp->m_quotainfo = NULL;
                 return error;
         }
@@ -1240,15 +1240,15 @@ xfs_qm_destroy_quotainfo(
         xfs_qm_list_destroy(&qi->qi_dqlist);
 
         if (qi->qi_uquotaip) {
-                XFS_PURGE_INODE(qi->qi_uquotaip);
+                IRELE(qi->qi_uquotaip);
                 qi->qi_uquotaip = NULL; /* paranoia */
         }
         if (qi->qi_gquotaip) {
-                XFS_PURGE_INODE(qi->qi_gquotaip);
+                IRELE(qi->qi_gquotaip);
                 qi->qi_gquotaip = NULL;
         }
         mutex_destroy(&qi->qi_quotaofflock);
-        kmem_free(qi, sizeof(xfs_quotainfo_t));
+        kmem_free(qi);
         mp->m_quotainfo = NULL;
 }
 
@@ -1394,7 +1394,7 @@ xfs_qm_qino_alloc(
          * locked exclusively and joined to the transaction already.
          */
         ASSERT(xfs_isilocked(*ip, XFS_ILOCK_EXCL));
-        VN_HOLD(XFS_ITOV((*ip)));
+        IHOLD(*ip);
 
         /*
          * Make the changes in the superblock, and log those too.
@@ -1623,7 +1623,7 @@ xfs_qm_dqiterate(
                         break;
         } while (nmaps > 0);
 
-        kmem_free(map, XFS_DQITER_MAP_SIZE * sizeof(*map));
+        kmem_free(map);
 
         return error;
 }