From c3c4e894d23772034ea9f543c95cf2ba99a88ea4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:07 -0700 Subject: [PATCH] --- yaml --- r: 252718 b: refs/heads/master c: e41a59e0550b7bb40fe8c3438d690712e9fd511c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/hostfs/hostfs_kern.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8e1f1a0994da..af639f0a5850 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3911785b8ae6897b3dae2af4fa296aa5a0f2c56 +refs/heads/master: e41a59e0550b7bb40fe8c3438d690712e9fd511c diff --git a/trunk/fs/hostfs/hostfs_kern.c b/trunk/fs/hostfs/hostfs_kern.c index e6816b9e6903..2638c834ed28 100644 --- a/trunk/fs/hostfs/hostfs_kern.c +++ b/trunk/fs/hostfs/hostfs_kern.c @@ -683,8 +683,6 @@ int hostfs_rmdir(struct inode *ino, struct dentry *dentry) char *file; int err; - dentry_unhash(dentry); - if ((file = dentry_name(dentry)) == NULL) return -ENOMEM; err = do_rmdir(file); @@ -738,9 +736,6 @@ int hostfs_rename(struct inode *from_ino, struct dentry *from, char *from_name, *to_name; int err; - if (to->d_inode && S_ISDIR(to->d_inode->i_mode)) - dentry_unhash(to); - if ((from_name = dentry_name(from)) == NULL) return -ENOMEM; if ((to_name = dentry_name(to)) == NULL) {