[Ocfs2-commits] rev 768 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-09 16:50:13 -0600 (Tue, 09 Mar 2004)
New Revision: 768

Modified:
   trunk/src/hash.c
Log:
fix a potential null pointer error during inode hash shutdown where we forgot to check if the inum had an inode attached.


Modified: trunk/src/hash.c
===================================================================
--- trunk/src/hash.c	2004-03-09 22:31:34 UTC (rev 767)
+++ trunk/src/hash.c	2004-03-09 22:50:13 UTC (rev 768)
@@ -1267,18 +1267,19 @@
 		inum = list_entry(iter, ocfs_inode_num, i_list);
 		list_del(&inum->i_list);
 
-		/* this log_error_args is mainly for debugging */
-		if (atomic_read(&inum->i_inode->i_count) > 2)
-			LOG_ERROR_ARGS("inode (%lu) with i_count = %u left in "
-				       "system, (voteoff = %u.%u, "
-				       "fileoff = %u.%u)\n", 
-				       inum->i_inode->i_ino,
-				       atomic_read(&inum->i_inode->i_count),
-				       HILO(inum->i_voteoff), 
-				       HILO(inum->i_feoff));
+		if (inum->i_inode) {
+			/* this log_error_args is mainly for debugging */
+			if (atomic_read(&inum->i_inode->i_count) > 2)
+				LOG_ERROR_ARGS("inode (%lu) with i_count = %u "
+					  "left in system, (voteoff = "
+					  "%u.%u, fileoff = %u.%u)\n", 
+					  inum->i_inode->i_ino,
+					  atomic_read(&inum->i_inode->i_count),
+					  HILO(inum->i_voteoff), 
+					  HILO(inum->i_feoff));
 
-		if (inum->i_inode)
 			iput(inum->i_inode);
+		}
 		ocfs_free_inode_num(inum);
 	}