diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 13:21:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 13:21:44 -0800 |
| commit | de1a2262b006220dae2561a299a6ea128c46f4fe (patch) | |
| tree | 0df7b3686f09a77a000fb63a333237facad3482c /include | |
| parent | f042fea0da78d9dc077a9c736b33b60eb8f35195 (diff) | |
| parent | ed84825b785ceb932af7dd5aa08614801721320b (diff) | |
Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback fixes from Wu Fengguang:
"Two writeback fixes
- fix negative (setpoint - dirty) in 32bit archs
- use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"
* tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
Negative (setpoint-dirty) in bdi_position_ratio()
vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/writeback.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index b82a83aba31..9a9367c0c07 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -87,9 +87,9 @@ int inode_wait(void *); void writeback_inodes_sb(struct super_block *, enum wb_reason reason); void writeback_inodes_sb_nr(struct super_block *, unsigned long nr, enum wb_reason reason); -int writeback_inodes_sb_if_idle(struct super_block *, enum wb_reason reason); -int writeback_inodes_sb_nr_if_idle(struct super_block *, unsigned long nr, - enum wb_reason reason); +int try_to_writeback_inodes_sb(struct super_block *, enum wb_reason reason); +int try_to_writeback_inodes_sb_nr(struct super_block *, unsigned long nr, + enum wb_reason reason); void sync_inodes_sb(struct super_block *); long writeback_inodes_wb(struct bdi_writeback *wb, long nr_pages, enum wb_reason reason); |