diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /fs | |
parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
download | op-kernel-dev-94b166a7cbc232df279e1f7d5a8acfb6b8d02d59.zip op-kernel-dev-94b166a7cbc232df279e1f7d5a8acfb6b8d02d59.tar.gz |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs-writeback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index ffab478..c27f8d4 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); |