From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 22 Apr 2008 07:33:46 +0000 (+1000)
Subject: [XFS] xfs_rename: pass resblks to xfs_dir_removename
X-Git-Tag: v2.6.26-rc1~346^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4377d84189349357e1812eaff6d0504766eea06;p=linux-2.6-omap-h63xx.git

[XFS] xfs_rename: pass resblks to xfs_dir_removename

Similar to rmdir and remove - avoids a potential transaction reservation
overrun.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30900a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
---

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 04f3e302fee..7093d749589 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -2241,7 +2241,7 @@ xfs_remove(
 	 */
 	XFS_BMAP_INIT(&free_list, &first_block);
 	error = xfs_dir_removename(tp, dp, name, ip->i_ino,
-					&first_block, &free_list, 0);
+					&first_block, &free_list, resblks);
 	if (error) {
 		ASSERT(error != ENOENT);
 		REMOVE_DEBUG_TRACE(__LINE__);