Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19675
b: refs/heads/master
c: e60e5c5
h: refs/heads/master
i:
  19673: 0349204
  19671: 59e80e6
v: v3
  • Loading branch information
OGAWA Hirofumi authored and Linus Torvalds committed Feb 3, 2006
1 parent 22bb859 commit 2593786
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5b00226d4d3aa7969d84e16f857ea100465d9c98
refs/heads/master: e60e5c50aa5389db86e96fc52d02bc7db3d23f4a
4 changes: 2 additions & 2 deletions trunk/fs/buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 2593786

Please sign in to comment.