[Ocfs2-commits] jlbec commits r1014 - branches/format-changes/src

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Fri Jun 4 20:52:31 CDT 2004


Author: jlbec
Date: 2004-06-04 19:52:29 -0500 (Fri, 04 Jun 2004)
New Revision: 1014

Modified:
   branches/format-changes/src/alloc.c
Log:

o Merged revision 993 from trunk.
	- Check status for all uses of ocfs_journal_access.



Modified: branches/format-changes/src/alloc.c
===================================================================
--- branches/format-changes/src/alloc.c	2004-06-05 00:01:42 UTC (rev 1013)
+++ branches/format-changes/src/alloc.c	2004-06-05 00:52:29 UTC (rev 1014)
@@ -1233,8 +1233,14 @@
 	if (k >= 0 &&
 	    ocfs_extent_contig(inode, &(extent->extents[k]), blkno)) {
 		OCFS_BH_PUT_DATA(extent_bh);
-		ocfs_journal_access(handle, extent_bh, 
-				    OCFS_JOURNAL_ACCESS_WRITE);
+
+		status = ocfs_journal_access(handle, extent_bh, 
+					     OCFS_JOURNAL_ACCESS_WRITE);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+
 		extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
 
 		extent->extents[k].e_clusters += new_clusters;
@@ -1249,8 +1255,14 @@
 	if (k != OCFS_MAX_DATA_EXTENTS) {
 		/* we can just add next extent */
 		OCFS_BH_PUT_DATA(extent_bh);
-		ocfs_journal_access(handle, extent_bh, 
-				    OCFS_JOURNAL_ACCESS_WRITE);
+
+		status = ocfs_journal_access(handle, extent_bh, 
+					     OCFS_JOURNAL_ACCESS_WRITE);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+
 		extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
 
 		extent->extents[k].e_cpos = fe->i_clusters;
@@ -1327,8 +1339,14 @@
 		}
 
 		OCFS_BH_PUT_DATA(extent_bh);
-		ocfs_journal_access(handle, extent_bh, 
-				    OCFS_JOURNAL_ACCESS_WRITE);
+
+		status = ocfs_journal_access(handle, extent_bh, 
+					     OCFS_JOURNAL_ACCESS_WRITE);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+
 		extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
 
 		extent->next_data_ext = newExtentOff;



More information about the Ocfs2-commits mailing list