diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 18:33:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 18:33:04 -0800 |
| commit | ba95fd47d177d46743ad94055908d22840370e06 (patch) | |
| tree | f29e6921fefba2728c3b7f6854ac7f7729f602b2 /fs | |
| parent | 59af0a0b5848caf38f1bf7013905c3e9cdba4d1d (diff) | |
| parent | be987fdb55a4726e2fcbab7501f89276bdb57288 (diff) | |
| download | linux-ba95fd47d177d46743ad94055908d22840370e06.tar.bz2 | |
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')
| -rw-r--r-- | fs/bio.c | 5 | ||||
| -rw-r--r-- | fs/buffer.c | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -302,9 +302,10 @@ void bio_init(struct bio *bio) struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) { struct bio *bio = NULL; + void *p; if (bs) { - void *p = mempool_alloc(bs->bio_pool, gfp_mask); + p = mempool_alloc(bs->bio_pool, gfp_mask); if (p) bio = p + bs->front_pad; @@ -329,7 +330,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) } if (unlikely(!bvl)) { if (bs) - mempool_free(bio, bs->bio_pool); + mempool_free(p, bs->bio_pool); else kfree(bio); bio = NULL; 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) if (test_clear_buffer_dirty(bh)) { get_bh(bh); bh->b_end_io = end_buffer_write_sync; - ret = submit_bh(WRITE_SYNC, bh); + ret = submit_bh(WRITE, bh); wait_on_buffer(bh); if (buffer_eopnotsupp(bh)) { clear_buffer_eopnotsupp(bh); |