From: adilger <adilger>
Date: Thu, 24 Feb 2005 19:21:10 +0000 (+0000)
Subject: Branch: b1_4
X-Git-Tag: v1_8_0_110~486^5~7
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9e52d5f04cad6888b14d11ead508a84a154cbf40;p=fs%2Flustre-release.git

Branch: b1_4
Fix bogus LASSERT when NFS exporting a filesystem.
This is for a structure we don't even use currently.
b=4655, 5760
r=green (original analysis + fix)
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index e43dddb..a0d38dd 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -21,8 +21,9 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
 	- 2.6 changed lock ordering of 2 semaphores, caused deadlock (5654)
 	- don't start multiple acceptors for the same port (5277)
 	- fix incorrect LASSERT in mds_getattr_name (5635)
-	- fix "lfs check" to not block when the MDS is down, and export a proc
-	  file for general "ping" checking (5628)
+	- export a proc file for general "ping" checking (5628)
+	- fix "lfs check" to not block when the MDS is down (5628)
+	- don't LASSERT in ll_release on NULL lld with NFS export (4655, 5760)
        * miscellania
 	- service request history (4965)
 	- put {ll,lov,osc}_async_page structs in a single slab (4699)
diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 9dcacc9..2909e1a 100644
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -41,7 +41,10 @@ static void ll_release(struct dentry *de)
         ENTRY;
         LASSERT(de != NULL);
         lld = ll_d2d(de);
-        LASSERT(lld != NULL);
+        if (lld == NULL) {
+                EXIT;
+                return;
+        }
         LASSERT(lld->lld_cwd_count == 0);
         LASSERT(lld->lld_mnt_count == 0);
         OBD_FREE(de->d_fsdata, sizeof(*lld));