From c532e96301409b2831006764e02452527aaa03f7 Mon Sep 17 00:00:00 2001
From: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Date: Sun, 29 Nov 2009 19:14:17 +0900
Subject: [PATCH] --- yaml --- r: 174727 b: refs/heads/master c:
 5f1586d0dd8f6eeecf6c0d35cbca6291afd6f1cc h: refs/heads/master i:   174725:
 32f85dbce8e041d6b39d2661252e426c7387d470   174723:
 f4e4b36c9f5ca34ef98e2969b9130e6f16479bdc   174719:
 54ce1bcd6db071e97c8b1bf2ecc53f24806f7904 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/nilfs2/segbuf.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index f673da5302a5..24bb21b2ea4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0935db747739782fc779eb58529610c12db88ea2
+refs/heads/master: 5f1586d0dd8f6eeecf6c0d35cbca6291afd6f1cc
diff --git a/trunk/fs/nilfs2/segbuf.c b/trunk/fs/nilfs2/segbuf.c
index e6d9e37fa241..c71b689bdbce 100644
--- a/trunk/fs/nilfs2/segbuf.c
+++ b/trunk/fs/nilfs2/segbuf.c
@@ -374,7 +374,7 @@ int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
 		       struct nilfs_write_info *wi)
 {
 	struct buffer_head *bh;
-	int res, rw = WRITE;
+	int res = 0, rw = WRITE;
 
 	list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) {
 		res = nilfs_submit_bh(wi, bh, rw);
@@ -395,17 +395,10 @@ int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,
 		 */
 		rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
 		res = nilfs_submit_seg_bio(wi, rw);
-		if (unlikely(res))
-			goto failed_bio;
 	}
 
-	res = 0;
- out:
-	return res;
-
  failed_bio:
-	atomic_inc(&wi->err);
-	goto out;
+	return res;
 }
 
 /**