From b14b223759b964b4b24223511a10c038d2d9722c Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Mon, 22 Mar 2010 21:36:06 +0900 Subject: [PATCH] --- yaml --- r: 189109 b: refs/heads/master c: 110d735a0ae69bdd11af9acb6ea3b979137eb118 h: refs/heads/master i: 189107: 39663f1530bee9701f583a481d1eb649886ff1d2 v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/segment.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a94f0f81e99..6102e294a52e 100644 --- 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 index b6221230f840..c161d89061b5 100644 --- 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);