summaryrefslogtreecommitdiffstats
path: root/fs/vfat/namei.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
commitb9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch)
tree42d07b0c7246ae2536a702e7c5de9e2732341116 /fs/vfat/namei.c
parent7406b0a326f2d70ade2671c37d1beef62249db97 (diff)
Merge with 2.3.99-pre6.
Diffstat (limited to 'fs/vfat/namei.c')
-rw-r--r--fs/vfat/namei.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index 1f7c788f5..ceb67870d 100644
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -1080,9 +1080,6 @@ int vfat_rmdir(struct inode *dir,struct dentry* dentry)
struct buffer_head *bh = NULL;
struct msdos_dir_entry *de;
- if (!d_unhashed(dentry))
- return -EBUSY;
-
res = fat_dir_empty(dentry->d_inode);
if (res)
return res;
@@ -1202,9 +1199,6 @@ int vfat_rename(struct inode *old_dir,struct dentry *old_dentry,
}
if (is_dir) {
- res =-EBUSY;
- if (!d_unhashed(new_dentry))
- goto rename_done;
res = fat_dir_empty(new_inode);
if (res)
goto rename_done;