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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-06-21 20:57:20 -0500 (Mon, 21 Jun 2004)
New Revision: 1180

Modified:
   trunk/src/dlm.c
   trunk/src/inode.c
   trunk/src/lockres.c
   trunk/src/lockres.h
   trunk/src/namei.c
   trunk/src/nm.c
Log:
* ocfs_update_lockres no longer takes a lock_id argument as that can
  be take from inode private.



Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/dlm.c	2004-06-22 01:57:20 UTC (rev 1180)
@@ -360,8 +360,7 @@
 
 finally:
 	if (lockres && status >= 0)
-		status = ocfs_update_lockres (osb, GET_INODE_FEOFF(inode), &bh,
-					      NULL, 0, inode, 0, 0);
+		status = ocfs_update_lockres (osb, &bh, NULL, 0, inode, 0, 0);
 
 	if (bh)
 		brelse(bh);
@@ -786,7 +785,7 @@
 
 	flags |= FLAG_ACQUIRE_LOCK;
 
-	status = ocfs_update_lockres (osb, lock_id, b, &updated, 0, inode, 
+	status = ocfs_update_lockres (osb, b, &updated, 0, inode, 
 				      1, 0);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);

Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/inode.c	2004-06-22 01:57:20 UTC (rev 1180)
@@ -2009,8 +2009,8 @@
 	up(&OCFS_I(inode)->ip_sem);
 	drop_ip_sem = 0;
 
-	status = ocfs_update_lockres (osb, GET_INODE_FEOFF(inode), &fe_bh, 
-				      NULL, 0, inode, 0, lockres_locked);
+	status = ocfs_update_lockres (osb, &fe_bh, NULL, 0, inode, 0, 
+				      lockres_locked);
 
 	status = 0;
 leave:

Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/lockres.c	2004-06-22 01:57:20 UTC (rev 1180)
@@ -60,7 +60,7 @@
  *
  * Returns 0 if success, < 0 if error.
  */
-int ocfs_update_lockres (ocfs_super * osb, __u64 lock_id, struct buffer_head **bh, __u32 * updated, __u32 timeout, struct inode *inode, int reread, int locked)
+int ocfs_update_lockres (ocfs_super * osb, struct buffer_head **bh, __u32 * updated, __u32 timeout, struct inode *inode, int reread, int locked)
 {
 	int status = 0;
 	struct buffer_head *tmpbh = NULL, **b = NULL;
@@ -69,7 +69,7 @@
 	ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);;
 
 	LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, 0x%p, 0x%p)\n", osb,
-			lock_id, lockres, bh, updated);
+			GET_INODE_FEOFF(inode), lockres, bh, updated);
 
 	b = (bh == NULL) ? &tmpbh : bh;
 
@@ -77,7 +77,7 @@
 		flags = (inode && OCFS_I(inode)->ip_flags & OCFS_INODE_SYSTEM_FILE) ?
 			0 : lockres->master_node_num == osb->node_num ? 
 		    	OCFS_BH_CACHED : 0;	
-		status = ocfs_read_bh(osb, lock_id, b, flags, inode);
+		status = ocfs_read_bh(osb, GET_INODE_FEOFF(inode), b, flags, inode);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto finally;

Modified: trunk/src/lockres.h
===================================================================
--- trunk/src/lockres.h	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/lockres.h	2004-06-22 01:57:20 UTC (rev 1180)
@@ -33,9 +33,8 @@
 int ocfs_acquire_lockres(ocfs_lock_res *lockres, __u32 timeout);
 void ocfs_init_lockres(ocfs_super *osb, struct inode *inode);
 void ocfs_release_lockres(ocfs_lock_res *lockres);
-int ocfs_update_lockres(ocfs_super *osb, __u64 lock_id,
-			struct buffer_head **bh, __u32 *updated,
-			__u32 timeout, struct inode *inode, int reread,
-			int locked);
+int ocfs_update_lockres(ocfs_super *osb, struct buffer_head **bh, 
+			__u32 *updated, __u32 timeout, struct inode *inode, 
+			int reread, int locked);
 
 #endif /* OCFS2_LOCKRES_H */

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/namei.c	2004-06-22 01:57:20 UTC (rev 1180)
@@ -252,8 +252,7 @@
 
 	ocfs_init_lockres(osb, inode);
 
-	status = ocfs_update_lockres(osb, GET_INODE_FEOFF(inode), 
-				     &new_fe_bh, NULL, 0, inode, 0, 0);
+	status = ocfs_update_lockres(osb, &new_fe_bh, NULL, 0, inode, 0, 0);
 	if (S_ISDIR (mode)) {
 		struct buffer_head *newdirbh = NULL;
 		int retval = 0;

Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-06-22 01:36:12 UTC (rev 1179)
+++ trunk/src/nm.c	2004-06-22 01:57:20 UTC (rev 1180)
@@ -779,7 +779,7 @@
 		have_io_sem = 1;
 
 		lockres = GET_INODE_LOCKRES(inode);
-		status = ocfs_update_lockres (osb, lock_id, NULL, NULL,
+		status = ocfs_update_lockres (osb, NULL, NULL,
 					      (OCFS_NM_HEARTBEAT_TIME/2), 
 					      inode, 1, 0);
 		if (status < 0) {