From: Oleg Drokin <green@whamcloud.com>
Date: Thu, 9 Jun 2011 16:00:25 +0000 (-0400)
Subject: LU-405 Don't assert on multiple disconnected dentries case
X-Git-Tag: 2.0.63.0~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a1b2d35d18884c4c785dc5ab4978d70a2b9ba864;p=fs%2Flustre-release.git

LU-405 Don't assert on multiple disconnected dentries case

NFS has a valid case for multiple disconnected dentries on the same
inode so we must not assert there as a workaround.
The proper fix is to adopt using of d_splice_alias eventually.

Change-Id: I28f7385d95523adf949a4e3b8887d79cdc4f2e37
Signed-off-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/923
Tested-by: Hudson
Reviewed-by: Fan Yong <yong.fan@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
---

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 9e4898c..ad98239 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -366,7 +366,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *de)
                 }
 
                 if (dentry->d_flags & DCACHE_DISCONNECTED) {
-                        LASSERT(last_discon == NULL);
+                        /* LASSERT(last_discon == NULL); LU-405, bz 20055 */
                         last_discon = dentry;
                         continue;
                 }