[Ocfs2-commits] mfasheh commits r1500 - branches/dlm-changes/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-27 19:47:27 -0500 (Mon, 27 Sep 2004)
New Revision: 1500

Modified:
   branches/dlm-changes/src/dir.c
   branches/dlm-changes/src/file.c
   branches/dlm-changes/src/suballoc.c
   branches/dlm-changes/src/suballoc.h
Log:
* remove 'inode' parameter from reserve_new_metadata as it was unused.

* free the proper inode at the bottom of reserve_new_metadata



Modified: branches/dlm-changes/src/dir.c
===================================================================
--- branches/dlm-changes/src/dir.c	2004-09-28 00:42:25 UTC (rev 1499)
+++ branches/dlm-changes/src/dir.c	2004-09-28 00:47:27 UTC (rev 1500)
@@ -437,7 +437,7 @@
 		}
 
 		if (!num_free_extents) {
-			status = ocfs_reserve_new_metadata(osb, handle, dir, 
+			status = ocfs_reserve_new_metadata(osb, handle,
 							   fe, &meta_ac);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);

Modified: branches/dlm-changes/src/file.c
===================================================================
--- branches/dlm-changes/src/file.c	2004-09-28 00:42:25 UTC (rev 1499)
+++ branches/dlm-changes/src/file.c	2004-09-28 00:47:27 UTC (rev 1500)
@@ -1229,7 +1229,6 @@
 	if (!num_free_extents) {
 		status = ocfs_reserve_new_metadata(osb, 
 						   handle, 
-						   inode, 
 						   fe, 
 						   &meta_ac);
 		if (status < 0) {

Modified: branches/dlm-changes/src/suballoc.c
===================================================================
--- branches/dlm-changes/src/suballoc.c	2004-09-28 00:42:25 UTC (rev 1499)
+++ branches/dlm-changes/src/suballoc.c	2004-09-28 00:47:27 UTC (rev 1500)
@@ -420,7 +420,6 @@
 
 int ocfs_reserve_new_metadata(ocfs_super *osb, 
 			      ocfs_journal_handle *handle,
-			      struct inode *inode,
 			      ocfs2_dinode *fe,
 			      ocfs2_alloc_context **ac)
 {
@@ -466,8 +465,8 @@
 		*ac = NULL;
 	}
 
-	if (inode)
-		iput(inode);
+	if (alloc_inode)
+		iput(alloc_inode);
 
 	LOG_EXIT_STATUS(status);
 	return status;

Modified: branches/dlm-changes/src/suballoc.h
===================================================================
--- branches/dlm-changes/src/suballoc.h	2004-09-28 00:42:25 UTC (rev 1499)
+++ branches/dlm-changes/src/suballoc.h	2004-09-28 00:47:27 UTC (rev 1500)
@@ -31,7 +31,6 @@
 
 int ocfs_reserve_new_metadata(ocfs_super *osb, 
 			      ocfs_journal_handle *handle,
-			      struct inode *inode,
 			      ocfs2_dinode *fe,
 			      ocfs2_alloc_context **ac);
 int ocfs_reserve_new_inode(ocfs_super *osb,