---

yaml --- r: 189109 b: refs/heads/master c: 110d735 h: refs/heads/master i: 189107: 39663f1 v: v3
git-mirror · Mar 23, 2010 · b14b223 · b14b223
1 parent e8c5a32
commit b14b223
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d8428acaee5468d194d8a84de22a0797791cb33
+refs/heads/master: 110d735a0ae69bdd11af9acb6ea3b979137eb118
diff --git a/trunk/fs/nilfs2/segment.c b/trunk/fs/nilfs2/segment.c
@@ -1897,8 +1897,7 @@ static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci,
 
 	list_splice_tail_init(&sci->sc_write_logs, &logs);
 	ret = nilfs_wait_on_logs(&logs);
-	if (ret)
-		nilfs_abort_logs(&logs, NULL, sci->sc_super_root, ret);
+	nilfs_abort_logs(&logs, NULL, sci->sc_super_root, ret ? : err);
 
 	list_splice_tail_init(&sci->sc_segbufs, &logs);
 	nilfs_cancel_segusage(&logs, nilfs->ns_sufile);