From 259378670d43db910882a1a6d9a4514e3de37426 Mon Sep 17 00:00:00 2001
From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Fri, 3 Feb 2006 03:04:43 -0800
Subject: [PATCH] --- yaml --- r: 19675 b: refs/heads/master c:
 e60e5c50aa5389db86e96fc52d02bc7db3d23f4a h: refs/heads/master i:   19673:
 03492046a85648cd276ed83d4e672876d377fab6   19671:
 59e80e6d0c5efd32928ffda2e1b8b4e6172ef534 v: v3

---
 [refs]            | 2 +-
 trunk/fs/buffer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72ba905fc874..6a2344333ce2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b00226d4d3aa7969d84e16f857ea100465d9c98
+refs/heads/master: e60e5c50aa5389db86e96fc52d02bc7db3d23f4a
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 5e4a90ee103f..62cfd17dc5fe 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2867,22 +2867,22 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])
 		else if (test_set_buffer_locked(bh))
 			continue;
 
-		get_bh(bh);
 		if (rw == WRITE || rw == SWRITE) {
 			if (test_clear_buffer_dirty(bh)) {
 				bh->b_end_io = end_buffer_write_sync;
+				get_bh(bh);
 				submit_bh(WRITE, bh);
 				continue;
 			}
 		} else {
 			if (!buffer_uptodate(bh)) {
 				bh->b_end_io = end_buffer_read_sync;
+				get_bh(bh);
 				submit_bh(rw, bh);
 				continue;
 			}
 		}
 		unlock_buffer(bh);
-		put_bh(bh);
 	}
 }