summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
commit94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch)
tree5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /fs
parent3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff)
parent1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff)
downloadlinux-94b166a7cbc232df279e1f7d5a8acfb6b8d02d59.tar.bz2
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'fs')
-rw-r--r--fs/fs-writeback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index ffab4783ac64..c27f8d4098be 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -247,7 +247,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
wait_queue_head_t *wqh;
if (!atomic_read(&inode->i_count))
- WARN_ON(!(inode->i_state & I_WILL_FREE));
+ WARN_ON(!(inode->i_state & (I_WILL_FREE|I_FREEING)));
else
WARN_ON(inode->i_state & I_WILL_FREE);