diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
| commit | 76e7461a21dfe13565b2a323b53c8cc963541126 (patch) | |
| tree | 8e399c71b38bb80c00d8a82310021b55ab6e8e33 /include/linux/writeback.h | |
| parent | d0b873fc73b793277c8a0824ce986b5bfeaef157 (diff) | |
| parent | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 705f01fe413a..c18c008f4bbf 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -79,8 +79,7 @@ void wakeup_flusher_threads(long nr_pages); | |||
| 79 | static inline void wait_on_inode(struct inode *inode) | 79 | static inline void wait_on_inode(struct inode *inode) |
| 80 | { | 80 | { |
| 81 | might_sleep(); | 81 | might_sleep(); |
| 82 | wait_on_bit(&inode->i_state, __I_LOCK, inode_wait, | 82 | wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE); |
| 83 | TASK_UNINTERRUPTIBLE); | ||
| 84 | } | 83 | } |
| 85 | static inline void inode_sync_wait(struct inode *inode) | 84 | static inline void inode_sync_wait(struct inode *inode) |
| 86 | { | 85 | { |