Automerge

182147c1 · Linus Torvalds · b51882df · edfb76af · 182147c1
Commit 182147c1 authored Jul 14, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

fs/buffer.c fs/buffer.c +2 -4

No files found.
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -519,8 +519,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
 		if (buffer_async_read(tmp)) {
 			if (buffer_locked(tmp))
 				goto still_busy;
-			if (!buffer_mapped(bh))
+			BUG();
-				BUG();
 		}
 		tmp = tmp->b_this_page;
 	} while (tmp != bh);
@@ -570,8 +569,7 @@ static void end_buffer_async_write(struct buffer_head *bh, int uptodate)
 		if (buffer_async_write(tmp)) {
 			if (buffer_locked(tmp))
 				goto still_busy;
-			if (!buffer_mapped(bh))
+			BUG();
-				BUG();
 		}
 		tmp = tmp->b_this_page;
 	}