diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-09-01 10:30:11 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-09-01 10:30:11 +1000 |
| commit | 5d54b8cdeaf4679c51a510dea3f8921992d0b064 (patch) | |
| tree | 62852f195efbd0e5c2bb222d6b74896de4ceac57 /fs/xfs/xfs_iops.c | |
| parent | 70b33a7466baac62103e04c916b8915665b79d80 (diff) | |
| parent | 1a7ccad88d1bcebabc011b54a2f8615175e523fc (diff) | |
Merge branch 'xfs-misc-fixes-for-4.3-4' into for-nextxfs-for-linus-4.3
Diffstat (limited to 'fs/xfs/xfs_iops.c')
| -rw-r--r-- | fs/xfs/xfs_iops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 766b23f86ce9..8294132e6a3c 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -609,7 +609,7 @@ xfs_setattr_nonsize( tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); error = xfs_trans_reserve(tp, &M_RES(mp)->tr_ichange, 0, 0); if (error) - goto out_dqrele; + goto out_trans_cancel; xfs_ilock(ip, XFS_ILOCK_EXCL); @@ -640,7 +640,7 @@ xfs_setattr_nonsize( NULL, capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0); if (error) /* out of quota */ - goto out_trans_cancel; + goto out_unlock; } } @@ -729,10 +729,10 @@ xfs_setattr_nonsize( return 0; +out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL); out_trans_cancel: xfs_trans_cancel(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); -out_dqrele: xfs_qm_dqrele(udqp); xfs_qm_dqrele(gdqp); return error; |