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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-05-12 20:36:38 -0500 (Thu, 12 May 2005)
New Revision: 2236

Modified:
   trunk/fs/ocfs2/file.c
   trunk/fs/ocfs2/mmap.c
   trunk/fs/ocfs2/suballoc.c
Log:
* in ocfs_write_lock_maybe_extend, don't set info->wl_extended unless we've 
  actually extended.

* more functions weren't properly filtering -ENOSPC, fix that

Signed-off-by: manish



Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c	2005-05-13 01:05:53 UTC (rev 2235)
+++ trunk/fs/ocfs2/file.c	2005-05-13 01:36:38 UTC (rev 2236)
@@ -639,7 +639,8 @@
 	status = ocfs_claim_clusters(osb, handle, data_ac, 1,
 				     &bit_off, &num_bits);
 	if (status < 0) {
-		mlog_errno(status);
+		if (status != -ENOSPC)
+			mlog_errno(status);
 		goto leave;
 	}
 
@@ -830,7 +831,8 @@
 					meta_ac,
 					&why);
 	if ((status < 0) && (status != -EAGAIN)) {
-		mlog_errno(status);
+		if (status != -ENOSPC)
+			mlog_errno(status);
 		goto leave;
 	}
 

Modified: trunk/fs/ocfs2/mmap.c
===================================================================
--- trunk/fs/ocfs2/mmap.c	2005-05-13 01:05:53 UTC (rev 2235)
+++ trunk/fs/ocfs2/mmap.c	2005-05-13 01:36:38 UTC (rev 2236)
@@ -553,7 +553,6 @@
 			level = 1;
 			goto lock;
 		}
-		info->wl_extended = 1;
 
 		mlog(0, "Writing at EOF, will need more allocation: "
 		     "i_size=%lld, need=%"MLFu64"\n", i_size_read(inode),
@@ -581,6 +580,8 @@
 			goto bail;
 		}
 
+		info->wl_extended = 1;
+
 		/* We need to recalulate newsize and count according
 		 * to what extend could give us. If we got the whole
 		 * extend then this doesn't wind up changing the

Modified: trunk/fs/ocfs2/suballoc.c
===================================================================
--- trunk/fs/ocfs2/suballoc.c	2005-05-13 01:05:53 UTC (rev 2235)
+++ trunk/fs/ocfs2/suballoc.c	2005-05-13 01:36:38 UTC (rev 2236)
@@ -1307,10 +1307,7 @@
 								 bg_bit_off);
 	}
 	if (status < 0) {
-		/* If you're not asking for contiguous blocks, then
-		 * the reserve function should've given you enough,
-		 * and ENOSPC this is a real error. */
-		if ((status != -ENOSPC) || (min_clusters == 1))
+		if (status != -ENOSPC)
 			mlog_errno(status);
 		goto bail;
 	}