patch-2.3.99-pre4 linux/fs/hfs/dir.c
Next file: linux/fs/hpfs/dir.c
Previous file: linux/fs/file_table.c
Back to the patch index
Back to the overall index
- Lines: 19
- Date:
Sun Apr 2 15:49:08 2000
- Orig file:
v2.3.99-pre3/linux/fs/hfs/dir.c
- Orig date:
Fri Mar 10 16:40:47 2000
diff -u --recursive --new-file v2.3.99-pre3/linux/fs/hfs/dir.c linux/fs/hfs/dir.c
@@ -314,14 +314,10 @@
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;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)