diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 21:33:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 21:33:04 -0500 |
| commit | ba95fd47d177d46743ad94055908d22840370e06 (patch) | |
| tree | f29e6921fefba2728c3b7f6854ac7f7729f602b2 /fs/buffer.c | |
| parent | 59af0a0b5848caf38f1bf7013905c3e9cdba4d1d (diff) | |
| parent | be987fdb55a4726e2fcbab7501f89276bdb57288 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: fix deadlock in blk_abort_queue() for drivers that readd to timeout list
block: fix booting from partitioned md array
block: revert part of 18ce3751ccd488c78d3827e9f6bf54e6322676fb
cciss: PCI power management reset for kexec
paride/pg.c: xs(): &&/|| confusion
fs/bio: bio_alloc_bioset: pass right object ptr to mempool_free
block: fix bad definition of BIO_RW_SYNC
bsg: Fix sense buffer bug in SG_IO
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index ff4d1cdd779b..9f697419ed8e 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -3109,7 +3109,7 @@ int sync_dirty_buffer(struct buffer_head *bh) | |||
| 3109 | if (test_clear_buffer_dirty(bh)) { | 3109 | if (test_clear_buffer_dirty(bh)) { |
| 3110 | get_bh(bh); | 3110 | get_bh(bh); |
| 3111 | bh->b_end_io = end_buffer_write_sync; | 3111 | bh->b_end_io = end_buffer_write_sync; |
| 3112 | ret = submit_bh(WRITE_SYNC, bh); | 3112 | ret = submit_bh(WRITE, bh); |
| 3113 | wait_on_buffer(bh); | 3113 | wait_on_buffer(bh); |
| 3114 | if (buffer_eopnotsupp(bh)) { | 3114 | if (buffer_eopnotsupp(bh)) { |
| 3115 | clear_buffer_eopnotsupp(bh); | 3115 | clear_buffer_eopnotsupp(bh); |