diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-07-09 08:52:32 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.(none)> | 2009-07-10 14:31:53 -0400 |
| commit | 8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0 (patch) | |
| tree | 76c8b4f1362a928d426f2201790ab5d128f57724 /include/linux/backing-dev.h | |
| parent | c2cc49a2f8a479dde96a599646d30b6cc9dbed78 (diff) | |
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 'include/linux/backing-dev.h')
| -rw-r--r-- | include/linux/backing-dev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 0ec2c594868e..3a52a63c1351 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h | |||
| @@ -229,9 +229,9 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi) | |||
| 229 | (1 << BDI_async_congested)); | 229 | (1 << BDI_async_congested)); |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | void clear_bdi_congested(struct backing_dev_info *bdi, int rw); | 232 | void clear_bdi_congested(struct backing_dev_info *bdi, int sync); |
| 233 | void set_bdi_congested(struct backing_dev_info *bdi, int rw); | 233 | void set_bdi_congested(struct backing_dev_info *bdi, int sync); |
| 234 | long congestion_wait(int rw, long timeout); | 234 | long congestion_wait(int sync, long timeout); |
| 235 | 235 | ||
| 236 | 236 | ||
| 237 | static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi) | 237 | static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi) |