diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-07-09 14:52:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.(none)> | 2009-07-10 20:31:53 +0200 |
| commit | 8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0 (patch) | |
| tree | 76c8b4f1362a928d426f2201790ab5d128f57724 /fs/xfs/linux-2.6/kmem.c | |
| parent | c2cc49a2f8a479dde96a599646d30b6cc9dbed78 (diff) | |
| download | lwn-8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0.tar.gz lwn-8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0.zip | |
Fix congestion_wait() sync/async vs read/write confusion
Commit 1faa16d22877f4839bd433547d770c676d1d964c accidentally broke
the bdi congestion wait queue logic, causing us to wait on congestion
for WRITE (== 1) when we really wanted BLK_RW_ASYNC (== 0) instead.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/xfs/linux-2.6/kmem.c')
| -rw-r--r-- | fs/xfs/linux-2.6/kmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c index 1cd3b55ee3d2..2d3f90afe5f1 100644 --- a/fs/xfs/linux-2.6/kmem.c +++ b/fs/xfs/linux-2.6/kmem.c @@ -53,7 +53,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags) printk(KERN_ERR "XFS: possible memory allocation " "deadlock in %s (mode:0x%x)\n", __func__, lflags); - congestion_wait(WRITE, HZ/50); + congestion_wait(BLK_RW_ASYNC, HZ/50); } while (1); } @@ -130,7 +130,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags) printk(KERN_ERR "XFS: possible memory allocation " "deadlock in %s (mode:0x%x)\n", __func__, lflags); - congestion_wait(WRITE, HZ/50); + congestion_wait(BLK_RW_ASYNC, HZ/50); } while (1); } |