[Ocfs2-commits] mfasheh commits r1606 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-10-29 17:15:14 -0500 (Fri, 29 Oct 2004)
New Revision: 1606

Modified:
   branches/dlm-glue/src/dlmglue.c
   branches/dlm-glue/src/inode.c
Log:
* don't print errors on -EINTR



Modified: branches/dlm-glue/src/dlmglue.c
===================================================================
--- branches/dlm-glue/src/dlmglue.c	2004-10-29 22:05:22 UTC (rev 1605)
+++ branches/dlm-glue/src/dlmglue.c	2004-10-29 22:15:14 UTC (rev 1606)
@@ -730,7 +730,7 @@
 	level = write ? LKM_EXMODE : LKM_PRMODE;
 
 	status = ocfs2_cluster_lock(inode, lock, level);
-	if (status < 0)
+	if (status < 0 && status != -EINTR)
 		LOG_ERROR_STATUS(status);
 
 	LOG_EXIT_STATUS(status);
@@ -980,10 +980,8 @@
 	 * locked from ocfs_recover_node. */
 	if (!INODE_JOURNAL(inode)) {
 		status = ocfs2_wait_on_recovery(osb);
-		if (status < 0) {
-			LOG_ERROR_STATUS(status);
+		if (status < 0)
 			goto bail;
-		}
 	}
 
 	lockres = &OCFS_I(inode)->ip_lockres;
@@ -992,16 +990,15 @@
 
 	status = ocfs2_cluster_lock(inode, lock, level);
 	if (status < 0) {
-		LOG_ERROR_STATUS(status);
+		if (status != -EINTR)
+			LOG_ERROR_STATUS(status);
 		goto bail;
 	}
 
 	if (!INODE_JOURNAL(inode)) {
 		status = ocfs2_wait_on_recovery(osb);
-		if (status < 0) {
-			LOG_ERROR_STATUS(status);
+		if (status < 0)
 			goto bail;
-		}
 	}
 
 	status = ocfs2_meta_lock_update(inode, &bh);

Modified: branches/dlm-glue/src/inode.c
===================================================================
--- branches/dlm-glue/src/inode.c	2004-10-29 22:05:22 UTC (rev 1605)
+++ branches/dlm-glue/src/inode.c	2004-10-29 22:15:14 UTC (rev 1606)
@@ -922,7 +922,8 @@
 
 	status = ocfs2_meta_lock(inode, NULL, NULL, 0);
 	if (status < 0) {
-		LOG_ERROR_STATUS(status);
+		if (status != -EINTR)
+			LOG_ERROR_STATUS(status);
 		goto bail;
 	}
 	ocfs2_meta_unlock(inode, 0);