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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-07-25 19:12:02 -0500 (Mon, 25 Jul 2005)
New Revision: 2476

Modified:
   trunk/fs/ocfs2/aio.c
   trunk/fs/ocfs2/dlmglue.c
   trunk/fs/ocfs2/mmap.c
Log:
* filter -eiocbqueued from being printed where it's valid to get it

Signed-off-by: zab



Modified: trunk/fs/ocfs2/aio.c
===================================================================
--- trunk/fs/ocfs2/aio.c	2005-07-25 22:54:05 UTC (rev 2475)
+++ trunk/fs/ocfs2/aio.c	2005-07-26 00:12:02 UTC (rev 2476)
@@ -269,7 +269,8 @@
 	okp->kp_info.wl_unlock_ctxt = 1; /* re-use the write info path */
 	ret = ocfs2_lock_buffer_inodes(&okp->kp_ctxt, NULL);
 	if (ret < 0) {
-		mlog_errno(ret);
+		if (ret != -EIOCBQUEUED)
+			mlog_errno(ret);
 		goto setmask;
 	}
 

Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-07-25 22:54:05 UTC (rev 2475)
+++ trunk/fs/ocfs2/dlmglue.c	2005-07-26 00:12:02 UTC (rev 2476)
@@ -1622,7 +1622,7 @@
 	status = ocfs2_cluster_lock(osb, lockres, level, dlm_flags, cb,
 				    cb_data);
 	if (status < 0) {
-		if (status != -EAGAIN)
+		if (status != -EAGAIN && status != -EIOCBQUEUED)
 			mlog_errno(status);
 		goto bail;
 	}

Modified: trunk/fs/ocfs2/mmap.c
===================================================================
--- trunk/fs/ocfs2/mmap.c	2005-07-25 22:54:05 UTC (rev 2475)
+++ trunk/fs/ocfs2/mmap.c	2005-07-26 00:12:02 UTC (rev 2476)
@@ -369,7 +369,8 @@
 						      ctxt->b_cb_data);
 
 			if (status < 0) {
-				mlog_errno(status);
+				if (status != -EIOCBQUEUED)
+					mlog_errno(status);
 				goto bail;
 			}
 
@@ -482,7 +483,8 @@
 		info->wl_unlock_ctxt = 1;
 		ret = ocfs2_lock_buffer_inodes(ctxt, inode);
 		if (ret < 0) {
-			mlog_errno(ret);
+			if (ret != -EIOCBQUEUED)
+				mlog_errno(ret);
 			goto bail;
 		}
 		info->wl_have_before = 1;
@@ -640,7 +642,8 @@
 	/* This will lock everyone who's order puts them *after* our inode. */
 	ret = ocfs2_lock_buffer_inodes(ctxt, NULL);
 	if (ret < 0) {
-		mlog_errno(ret);
+		if (ret != -EIOCBQUEUED)
+			mlog_errno(ret);
 		goto bail;
 	}