diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
commit | ef0eaa13362041f531f951b89362bfbc177e2bc0 (patch) | |
tree | e2d43099698aa238f9d108c67451871b0d4073f9 /fs/fs-writeback.c | |
parent | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (diff) | |
parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/fs-writeback.c')
-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 ffab4783ac6..c27f8d4098b 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); |