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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-06-07 20:03:31 -0500 (Tue, 07 Jun 2005)
New Revision: 2378

Modified:
   trunk/fs/ocfs2/aops.c
   trunk/fs/ocfs2/dir.c
   trunk/fs/ocfs2/dlmglue.c
   trunk/fs/ocfs2/file.c
   trunk/fs/ocfs2/inode.c
   trunk/fs/ocfs2/namei.c
Log:
* Don't print an -ENOENT return from ocfs2_meta_lock where appropriate 

Signed-off-by: jlbec



Modified: trunk/fs/ocfs2/aops.c
===================================================================
--- trunk/fs/ocfs2/aops.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/aops.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -277,7 +277,8 @@
 	if (!INODE_JOURNAL(inode)) {
 		err = ocfs2_meta_lock(inode, NULL, NULL, 0);
 		if (err) {
-			mlog_errno(err);
+			if (err != -ENOENT)
+				mlog_errno(err);
 			goto bail;
 		}
 		down_read(&OCFS2_I(inode)->ip_alloc_sem);

Modified: trunk/fs/ocfs2/dir.c
===================================================================
--- trunk/fs/ocfs2/dir.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/dir.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -89,7 +89,8 @@
 
 	error = ocfs2_meta_lock(inode, NULL, NULL, 0);
 	if (error < 0) {
-		mlog_errno(error);
+		if (error != -ENOENT)
+			mlog_errno(error);
 		/* we haven't got any yet, so propagate the error. */
 		stored = error;
 		goto bail;
@@ -216,11 +217,10 @@
 		   osb, OCFS2_I(inode)->ip_blkno, namelen, name, blkno, inode);
 
 	if (take_lock) {
-		/* Get a lock on the directory... */
 		status = ocfs2_meta_lock(inode, NULL, NULL, 0);
 		if (status < 0) {
-			/* Volume should be disabled in this case */
-			mlog_errno(status);
+			if (status != -ENOENT)
+				mlog_errno(status);
 			goto leave;
 		}
 		lock_acq = 1;

Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/dlmglue.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -1640,7 +1640,8 @@
 	 * disk if we have to, so the complexity is worthwhile. */
 	status = ocfs2_meta_lock_update(inode, &local_bh);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail;
 	}
 

Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/file.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -952,7 +952,8 @@
 
 	status = ocfs2_meta_lock(inode, NULL, &bh, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail;
 	}
 	unlock = 1;

Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/inode.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -511,7 +511,8 @@
 	status = ocfs2_meta_lock(inode, NULL, &fe_bh, 1);
 	atomic_dec(&inode->i_count);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail_unblock;
 	}
 	unlock = 1;
@@ -858,7 +859,8 @@
 	 * inode for us. */
 	status = ocfs2_meta_lock(inode, NULL, NULL, 0);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail;
 	}
 	ocfs2_meta_unlock(inode, 0);

Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c	2005-06-08 00:51:11 UTC (rev 2377)
+++ trunk/fs/ocfs2/namei.c	2005-06-08 01:03:31 UTC (rev 2378)
@@ -351,7 +351,8 @@
 
 	status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto leave;
 	}
 
@@ -667,7 +668,8 @@
 
 	err = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
 	if (err < 0) {
-		mlog_errno(err);
+		if (err != -ENOENT)
+			mlog_errno(err);
 		goto bail;
 	}
 
@@ -686,7 +688,8 @@
 
 	err = ocfs2_meta_lock(inode, handle, &fe_bh, 1);
 	if (err < 0) {
-		mlog_errno(err);
+		if (err != -ENOENT)
+			mlog_errno(err);
 		goto bail;
 	}
 
@@ -789,7 +792,8 @@
 
 	status = ocfs2_meta_lock(dir, handle, &parent_node_bh, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto leave;
 	}
 
@@ -814,7 +818,8 @@
 
 	status = ocfs2_meta_lock(inode, handle, &fe_bh, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto leave;
 	}
 
@@ -977,14 +982,16 @@
 		/* lock id2 */
 		status = ocfs2_meta_lock(inode2, handle, bh2, 1);
 		if (status < 0) {
-			mlog_errno(status);
+			if (status != -ENOENT)
+				mlog_errno(status);
 			goto bail;
 		}
 	}
 	/* lock id1 */
 	status = ocfs2_meta_lock(inode1, handle, bh1, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail;
 	}
 bail:
@@ -1081,7 +1088,8 @@
 		 * doing node locking on it. */
 		status = ocfs2_meta_lock(old_inode, handle, NULL, 1);
 		if (status < 0) {
-			mlog_errno(status);
+			if (status != -ENOENT)
+				mlog_errno(status);
 			goto bail;
 		}
 
@@ -1166,7 +1174,8 @@
 
 		status = ocfs2_meta_lock(new_inode, handle, &newfe_bh, 1);
 		if (status < 0) {
-			mlog_errno(status);
+			if (status != -ENOENT)
+				mlog_errno(status);
 			goto bail;
 		}
 
@@ -1537,7 +1546,8 @@
 	/* lock the parent directory */
 	status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOENT)
+			mlog_errno(status);
 		goto bail;
 	}