[Ocfs2-commits] mfasheh commits r2242 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-05-13 13:41:15 -0500 (Fri, 13 May 2005)
New Revision: 2242

Modified:
   trunk/fs/ocfs2/dlmglue.c
   trunk/fs/ocfs2/super.c
Log:
* Always iput system inodes on dismount.

Signed-off-by: manish



Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-05-13 18:15:03 UTC (rev 2241)
+++ trunk/fs/ocfs2/dlmglue.c	2005-05-13 18:41:15 UTC (rev 2242)
@@ -1723,6 +1723,8 @@
 
 	ocfs2_lock_res_free(&osb->super_lockres);
 	dlm_unregister_domain(osb->dlm);
+	osb->dlm = NULL;
+
 	mlog_exit_void();
 }
 

Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c	2005-05-13 18:15:03 UTC (rev 2241)
+++ trunk/fs/ocfs2/super.c	2005-05-13 18:41:15 UTC (rev 2242)
@@ -861,9 +861,11 @@
 			mlog_errno(tmp);
 
 		ocfs2_put_slot(osb);
+	}
 
-		ocfs_release_system_inodes(osb);
+	ocfs_release_system_inodes(osb);
 
+	if (osb->dlm) {
 		ocfs2_unregister_net_handlers(osb);
 
 		ocfs2_dlm_shutdown(osb);