1 files changed, 12 insertions, 16 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 0176bb21f09a..dc730ac272be 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -322,18 +322,9 @@ xfs_inactive(
         xfs_trans_ijoin(tp, ip, 0);
 
         if (S_ISLNK(ip->i_d.di_mode)) {
-                /*
-                 * Zero length symlinks _can_ exist.
-                 */
-                if (ip->i_d.di_size > XFS_IFORK_DSIZE(ip)) {
-                        error = xfs_inactive_symlink_rmt(ip, &tp);
-                        if (error)
-                                goto out_cancel;
-                } else if (ip->i_df.if_bytes > 0) {
-                        xfs_idata_realloc(ip, -(ip->i_df.if_bytes),
-                                          XFS_DATA_FORK);
-                        ASSERT(ip->i_df.if_bytes == 0);
-                }
+                error = xfs_inactive_symlink(ip, &tp);
+                if (error)
+                        goto out_cancel;
         } else if (truncate) {
                 ip->i_d.di_size = 0;
                 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
@@ -498,6 +489,7 @@ xfs_create(
         prid_t                  prid;
         struct xfs_dquot        *udqp = NULL;
         struct xfs_dquot        *gdqp = NULL;
+        struct xfs_dquot        *pdqp = NULL;
         uint                    resblks;
         uint                    log_res;
         uint                    log_count;
@@ -516,7 +508,8 @@ xfs_create(
          * Make sure that we have allocated dquot(s) on disk.
          */
         error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
-                        XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
+                                        XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
+                                        &udqp, &gdqp, &pdqp);
         if (error)
                 return error;
 
@@ -568,7 +561,8 @@ xfs_create(
         /*
          * Reserve disk quota and the inode.
          */
-        error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp, resblks, 1, 0);
+        error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp,
+                                                pdqp, resblks, 1, 0);
         if (error)
                 goto out_trans_cancel;
 
@@ -632,7 +626,7 @@ xfs_create(
          * These ids of the inode couldn't have changed since the new
          * inode has been locked ever since it was created.
          */
-        xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp);
+        xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp);
 
         error = xfs_bmap_finish(&tp, &free_list, &committed);
         if (error)
@@ -644,6 +638,7 @@ xfs_create(
 
         xfs_qm_dqrele(udqp);
         xfs_qm_dqrele(gdqp);
+        xfs_qm_dqrele(pdqp);
 
         *ipp = ip;
         return 0;
@@ -665,6 +660,7 @@ xfs_create(
 
         xfs_qm_dqrele(udqp);
         xfs_qm_dqrele(gdqp);
+        xfs_qm_dqrele(pdqp);
 
         if (unlock_dp_on_error)
                 xfs_iunlock(dp, XFS_ILOCK_EXCL);
@@ -1577,7 +1573,7 @@ xfs_free_file_space(
                 }
                 xfs_ilock(ip, XFS_ILOCK_EXCL);
                 error = xfs_trans_reserve_quota(tp, mp,
-                                ip->i_udquot, ip->i_gdquot,
+                                ip->i_udquot, ip->i_gdquot, ip->i_pdquot,
                                 resblks, 0, XFS_QMOPT_RES_REGBLKS);
                 if (error)
                         goto error1;