From 46e045034336a2cc90c1798cd7cc07af744ddfd6 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 19 Apr 2000 04:00:00 +0000 Subject: Merge with Linux 2.3.99-pre4. --- fs/hfs/dir.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'fs/hfs/dir.c') diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c index debe0a967..07f4ab93d 100644 --- a/fs/hfs/dir.c +++ b/fs/hfs/dir.c @@ -314,14 +314,10 @@ int hfs_rmdir(struct inode * parent, struct dentry *dentry) if (!d_unhashed(dentry)) goto hfs_rmdir_put; - if (/* we only have to worry about 2 and 3 for mount points */ - (victim->sys_entry[2] && - (victim->sys_entry[2]->d_mounts != - victim->sys_entry[2]->d_covers)) || - (victim->sys_entry[3] && - (victim->sys_entry[3]->d_mounts != - victim->sys_entry[3]->d_covers)) - ) + /* we only have to worry about 2 and 3 for mount points */ + if (victim->sys_entry[2] && d_mountpoint(victim->sys_entry[2])) + goto hfs_rmdir_put; + if (victim->sys_entry[3] && d_mountpoint(victim->sys_entry[3])) goto hfs_rmdir_put; -- cgit v1.2.3