Commit 182147c1 authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents b51882df edfb76af
...@@ -519,7 +519,6 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) ...@@ -519,7 +519,6 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
if (buffer_async_read(tmp)) { if (buffer_async_read(tmp)) {
if (buffer_locked(tmp)) if (buffer_locked(tmp))
goto still_busy; goto still_busy;
if (!buffer_mapped(bh))
BUG(); BUG();
} }
tmp = tmp->b_this_page; tmp = tmp->b_this_page;
...@@ -570,7 +569,6 @@ static void end_buffer_async_write(struct buffer_head *bh, int uptodate) ...@@ -570,7 +569,6 @@ static void end_buffer_async_write(struct buffer_head *bh, int uptodate)
if (buffer_async_write(tmp)) { if (buffer_async_write(tmp)) {
if (buffer_locked(tmp)) if (buffer_locked(tmp))
goto still_busy; goto still_busy;
if (!buffer_mapped(bh))
BUG(); BUG();
} }
tmp = tmp->b_this_page; tmp = tmp->b_this_page;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment