diff --git a/[refs] b/[refs] index c67da4023675..786f71304d0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79cd22d3ac921b9209bf813c7e75e6b69e74896c +refs/heads/master: 711a40fcaa83bfad87736544b69f6fdd6527482d diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c index 259155f0eb2e..a57b751d4f40 100644 --- a/trunk/fs/ocfs2/namei.c +++ b/trunk/fs/ocfs2/namei.c @@ -1085,14 +1085,6 @@ static int ocfs2_rename(struct inode *old_dir, BUG(); } - if (atomic_read(&old_dentry->d_count) > 2) { - shrink_dcache_parent(old_dentry); - if (atomic_read(&old_dentry->d_count) > 2) { - status = -EBUSY; - goto bail; - } - } - /* Assume a directory heirarchy thusly: * a/b/c * a/d