[Ocfs2-commits] mfasheh commits r805 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-22 16:51:07 -0600 (Mon, 22 Mar 2004)
New Revision: 805

Modified:
   trunk/src/oin.c
Log:
* include a patch from Rusty Lynch <rusty at linux.co.intel.com>:

This patch catches the scenario where a dismount has already
been started, and a ocfs_release_cached_oin() has been kicked
off as a result of ocfs_inode_hash_destroy() calling iput()
on any remaining inodes.

http://oss.oracle.com/bugzilla/show_bug.cgi?id=47

This will cause a 2.6 system built with memory debugging to
crash (indicating that we are doing something wrong, which is using
our cache objects after we have free'ed them.)

I haven't seen a crash on 2.4 due to this, but a 2.4 system does
come across this scenario (but it just doesn't crash.)



Modified: trunk/src/oin.c
===================================================================
--- trunk/src/oin.c	2004-03-22 18:41:59 UTC (rev 804)
+++ trunk/src/oin.c	2004-03-22 22:51:07 UTC (rev 805)
@@ -726,6 +726,17 @@
 	if (oin == NULL)
 		goto bail;
 
+	/*
+	 * If the OCFS_OSB_FLAGS_BEING_DISMOUNTED flag has
+	 * already been set, then the lockres hash has already
+	 * been cleaned out which means that we have a lock_res
+	 * pointer that points to free memory.
+	 */
+	if (osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED) {
+		oin->lock_res = NULL;
+		goto bail;
+	}
+
 	ocfs_down_sem (&(oin->main_res), true);
 	bAcquiredOIN = true;
         inode = oin->inode;