From 6ac6dcfa4456794dcb0f0f729dd44028bf0d989b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 15 Feb 2011 01:42:59 -0500 Subject: [PATCH] --- yaml --- r: 233241 b: refs/heads/master c: 4e924a4f53a0e1ea060bd50695a12a238b250322 h: refs/heads/master i: 233239: 6967e0d878125be0fdaa83cc84e839a69d431844 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2048e9b542cd..4d713076280c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f60aef7ec625236a6366722bb1be7b37596bf0ae +refs/heads/master: 4e924a4f53a0e1ea060bd50695a12a238b250322 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 10635d329175..9e701e28a329 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -455,14 +455,6 @@ static int nameidata_dentry_drop_rcu(struct nameidata *nd, struct dentry *dentry struct fs_struct *fs = current->fs; struct dentry *parent = nd->path.dentry; - /* - * It can be possible to revalidate the dentry that we started - * the path walk with. force_reval_path may also revalidate the - * dentry already committed to the nameidata. - */ - if (unlikely(parent == dentry)) - return nameidata_drop_rcu(nd); - BUG_ON(!(nd->flags & LOOKUP_RCU)); if (nd->root.mnt) { spin_lock(&fs->lock);