xfs-linux/xfs_vnodeops.c - diff

Return to xfs_vnodeops.c CVS log

Up to [OSS] / xfs-linux

version 1.690, 2007/03/02 02:59:33	version 1.691, 2007/03/03 02:57:44
Line 2120 int xfs_rm_attempts;	Line 2120 int xfs_rm_attempts;
STATIC int	STATIC int
xfs_lock_dir_and_entry(	xfs_lock_dir_and_entry(
xfs_inode_t *dp,	xfs_inode_t *dp,
bhv_vname_t *dentry,
xfs_inode_t ip) / inode of entry 'name' */	xfs_inode_t ip) / inode of entry 'name' */
{	{
int attempts;	int attempts;
Line 2439 xfs_remove(	Line 2438 xfs_remove(
return error;	return error;
}	}

error = xfs_lock_dir_and_entry(dp, dentry, ip);	error = xfs_lock_dir_and_entry(dp, ip);
if (error) {	if (error) {
REMOVE_DEBUG_TRACE(__LINE__);	REMOVE_DEBUG_TRACE(__LINE__);
xfs_trans_cancel(tp, cancel_flags);	xfs_trans_cancel(tp, cancel_flags);
Line 3095 xfs_rmdir(	Line 3094 xfs_rmdir(
* that the directory entry for the child directory inode has	* that the directory entry for the child directory inode has
* not changed while we were obtaining a log reservation.	* not changed while we were obtaining a log reservation.
*/	*/
error = xfs_lock_dir_and_entry(dp, dentry, cdp);	error = xfs_lock_dir_and_entry(dp, cdp);
if (error) {	if (error) {
xfs_trans_cancel(tp, cancel_flags);	xfs_trans_cancel(tp, cancel_flags);
IRELE(cdp);	IRELE(cdp);