[XFS] Merge xfs_rmdir into xfs_remove
authorChristoph Hellwig <hch@infradead.org>
Mon, 23 Jun 2008 03:25:17 +0000 (13:25 +1000)
committerNiv Sardi <xaiki@debian.org>
Mon, 28 Jul 2008 06:58:58 +0000 (16:58 +1000)
commit8f112e3bc3508afc8d1612868d178359446c08fd
tree64a03e036369ab3819f6675698454a8a250097d1
parent61f10fad1947116055c694321d9d8f21152c0582
[XFS] Merge xfs_rmdir into xfs_remove

xfs_remove and xfs_rmdir are almost the same with a little more work
performed in xfs_rmdir due to the . and .. entries. This patch merges
xfs_rmdir into xfs_remove and performs these actions conditionally.

Also clean up the error handling which was a nightmare in both versions
before.

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31335a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
fs/xfs/linux-2.6/xfs_iops.c
fs/xfs/xfs_vnodeops.c
fs/xfs/xfs_vnodeops.h