[Ocfs2-commits] mfasheh commits r2583 - branches/readonly-operation/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-09-16 17:23:33 -0500 (Fri, 16 Sep 2005)
New Revision: 2583

Modified:
   branches/readonly-operation/fs/ocfs2/super.c
Log:
* check OCFS2_OSB_ERROR_FS *not* OCFS2_ERROR_FS during rw remount

* don't specify is_remount on mount option parsing



Modified: branches/readonly-operation/fs/ocfs2/super.c
===================================================================
--- branches/readonly-operation/fs/ocfs2/super.c	2005-09-16 22:13:58 UTC (rev 2582)
+++ branches/readonly-operation/fs/ocfs2/super.c	2005-09-16 22:23:33 UTC (rev 2583)
@@ -394,7 +394,7 @@
 		} else {
 			mlog(0, "Making ro filesystem writeable.\n");
 
-			if (osb->osb_flags & OCFS2_ERROR_FS) {
+			if (osb->osb_flags & OCFS2_OSB_ERROR_FS) {
 				mlog(ML_ERROR, "Cannot remount RDWR "
 				     "filesystem due to previous errors.\n");
 				ret = -EROFS;
@@ -542,7 +542,7 @@
 	brelse(bh);
 	bh = NULL;
 
-	if (!ocfs2_parse_options(sb, data, &parsed_opt, 1)) {
+	if (!ocfs2_parse_options(sb, data, &parsed_opt, 0)) {
 		status = -EINVAL;
 		goto read_super_error;
 	}