TAKE 981498

* TAKE 981498 - Merge xfs_rmdir into xfs_remove
@ 2008-06-20  1:08 Barry Naujok
  0 siblings, 0 replies; only message in thread
From: Barry Naujok @ 2008-06-20  1:08 UTC (permalink / raw)
  To: sgi.bugs.xfs; +Cc: 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.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Date:  Fri Jun 20 11:07:57 AEST 2008
Workarea:  chook.melbourne.sgi.com:/home/bnaujok/isms/2.6.x-xfs
Inspected by:  hch@lst.de

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/linux/2.6.x-xfs-melb

Modid:  xfs-linux-melb:xfs-kern:31335a
fs/xfs/xfs_vnodeops.c - 1.762 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/xfs_vnodeops.c.diff?r1=text&tr1=1.762&r2=text&tr2=1.761&f=h
	- Merge xfs_remove and xfs_rmdir

fs/xfs/linux-2.6/xfs_iops.c - 1.290 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_iops.c.diff?r1=text&tr1=1.290&r2=text&tr2=1.289&f=h
	- Merge xfs_vn_rmdir and xfs_vn_unlink

fs/xfs/xfs_vnodeops.h - 1.18 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/xfs_vnodeops.h.diff?r1=text&tr1=1.18&r2=text&tr2=1.17&f=h
	- Merge xfs_remove and xfs_rmdir

^ permalink raw reply	[flat|nested] only message in thread