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

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu May 19 16:39:02 CDT 2005


Author: mfasheh
Signed-off-by: manish
Date: 2005-05-19 16:39:00 -0500 (Thu, 19 May 2005)
New Revision: 2289

Modified:
   trunk/fs/ocfs2/dlmglue.c
Log:
* remove unused code

Signed-off-by: manish



Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-05-19 20:36:29 UTC (rev 2288)
+++ trunk/fs/ocfs2/dlmglue.c	2005-05-19 21:39:00 UTC (rev 2289)
@@ -1554,51 +1554,6 @@
 	return status;
 }
 
-#if 0
-/* grabs the meta lock synchronusly.  */
-int ocfs2_meta_lock_flags(struct inode *inode,
-			  ocfs_journal_handle *handle,
-			  struct buffer_head **ret_bh,
-			  int ex,
-			  int flags)
-{
-	int status;
-
-	mlog_entry_void();
-
-	BUG_ON(handle && !ex);
-
-	status = ocfs2_meta_lock_flags_async(inode, ret_bh, ex, flags,
-					     NULL, 0);
-	if (status)
-		goto bail;
-
-	if (ret_bh && !(*ret_bh)) {
-		/* caller wants a buffer head but we haven't read it yet. */
-		status = ocfs_read_block(OCFS2_SB(inode->i_sb),
-					 OCFS_I(inode)->ip_blkno, ret_bh,
-					 OCFS_BH_CACHED, inode);
-		if (status < 0) {
-			mlog_errno(status);
-			goto bail;
-		}
-	}
-	if (handle) {
-		status = ocfs_handle_add_lock(handle, inode);
-		if (status < 0)
-			mlog_errno(status);
-	}
-bail:
-	if (status < 0 && ret_bh && (*ret_bh)) {
-		brelse(*ret_bh);
-		ret_bh = NULL;
-	}
-
-	mlog_exit(status);
-	return status;
-}
-#endif
-
 void ocfs2_meta_unlock(struct inode *inode,
 		       int ex)
 {
@@ -1612,6 +1567,7 @@
 	     ex ? "EXMODE" : "PRMODE");
 
 	ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
+
 	mlog_exit_void();
 }
 



More information about the Ocfs2-commits mailing list