diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-06-12 22:28:59 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-06-12 22:28:59 -0400 |
commit | fd40261354802b0f05f6f67121235aa002e87069 (patch) | |
tree | 935f23fa1528f6fe5a078383c9343907ea27fbb3 /fs/xfs/xfs_rename.c | |
parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
parent | e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 (diff) |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Diffstat (limited to 'fs/xfs/xfs_rename.c')
-rw-r--r-- | fs/xfs/xfs_rename.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index 58f85e9cd11d..b81deea0ce19 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c | |||
@@ -166,7 +166,8 @@ xfs_rename( | |||
166 | /* | 166 | /* |
167 | * Attach the dquots to the inodes | 167 | * Attach the dquots to the inodes |
168 | */ | 168 | */ |
169 | if ((error = XFS_QM_DQVOPRENAME(mp, inodes))) { | 169 | error = xfs_qm_vop_rename_dqattach(inodes); |
170 | if (error) { | ||
170 | xfs_trans_cancel(tp, cancel_flags); | 171 | xfs_trans_cancel(tp, cancel_flags); |
171 | goto std_return; | 172 | goto std_return; |
172 | } | 173 | } |