---

yaml --- r: 185471 b: refs/heads/master c: fe5f171 h: refs/heads/master i: 185469: bf19088 185467: 5335195 185463: b4d98ed 185455: 427251c 185439: a227f58 185407: 463f9b2 185343: a57c266 v: v3
git-mirror · Feb 13, 2010 · 9320478 · 9320478
1 parent 38cf4b5
commit 9320478
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7512487e6d6459e4c3f9c7cedc53050a6c30e387
+refs/heads/master: fe5f171bb272946ce5fbf843ce2f8467d0d41b9a
diff --git a/trunk/fs/nilfs2/segment.c b/trunk/fs/nilfs2/segment.c
@@ -2875,8 +2875,15 @@ int nilfs_attach_segment_constructor(struct nilfs_sb_info *sbi)
 	struct the_nilfs *nilfs = sbi->s_nilfs;
 	int err;
 
-	/* Each field of nilfs_segctor is cleared through the initialization
-	   of super-block info */
+	if (NILFS_SC(sbi)) {
+		/*
+		 * This happens if the filesystem was remounted
+		 * read/write after nilfs_error degenerated it into a
+		 * read-only mount.
+		 */
+		nilfs_detach_segment_constructor(sbi);
+	}
+
 	sbi->s_sc_info = nilfs_segctor_new(sbi);
 	if (!sbi->s_sc_info)
 		return -ENOMEM;

diff --git a/trunk/fs/nilfs2/super.c b/trunk/fs/nilfs2/super.c
@@ -96,9 +96,6 @@ void nilfs_error(struct super_block *sb, const char *function,
 	if (!(sb->s_flags & MS_RDONLY)) {
 		struct the_nilfs *nilfs = sbi->s_nilfs;
 
-		if (!nilfs_test_opt(sbi, ERRORS_CONT))
-			nilfs_detach_segment_constructor(sbi);
-
 		down_write(&nilfs->ns_sem);
 		if (!(nilfs->ns_mount_state & NILFS_ERROR_FS)) {
 			nilfs->ns_mount_state |= NILFS_ERROR_FS;