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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-04-07 16:22:29 -0500 (Thu, 07 Apr 2005)
New Revision: 2122

Modified:
   trunk/fs/ocfs2/dlmglue.c
   trunk/fs/ocfs2/inode.c
Log:
* silence some prints when we catch -EINTR

Signed-off-by: manish



Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-04-06 23:44:01 UTC (rev 2121)
+++ trunk/fs/ocfs2/dlmglue.c	2005-04-07 21:22:29 UTC (rev 2122)
@@ -1731,7 +1731,7 @@
 
 	ocfs2_wait_on_busy_lock(lockres);
 	if (signal_pending(current)) {
-		printk("ocfs2_drop_lock: Signal caught!\n");
+		LOG_TRACE_STR("Signal caught!\n");
 		ret = -EINTR;
 	}
 bail:

Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c	2005-04-06 23:44:01 UTC (rev 2121)
+++ trunk/fs/ocfs2/inode.c	2005-04-07 21:22:29 UTC (rev 2122)
@@ -647,7 +647,8 @@
 	status = ocfs2_meta_lock(inode, NULL, &fe_bh, 1);
 	atomic_dec(&inode->i_count);
 	if (status < 0) {
-		LOG_ERROR_STATUS(status);
+		if (status != -EINTR)
+			LOG_ERROR_STATUS(status);
 		goto bail;
 	}
 
@@ -851,7 +852,7 @@
 	ocfs2_extent_map_drop(inode, 0);
 
 	status = ocfs2_drop_inode_locks(inode);
-	if (status < 0)
+	if (status < 0 && status != -EINTR)
 		LOG_ERROR_STATUS(status);
 
 	ocfs2_lock_res_free(&OCFS_I(inode)->ip_meta_lockres);