|
@@ -449,8 +449,13 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
|
|
spin_lock(&inode_lock);
|
|
spin_lock(&inode_lock);
|
|
inode->i_state &= ~I_SYNC;
|
|
inode->i_state &= ~I_SYNC;
|
|
if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
|
|
if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
|
|
- if (!(inode->i_state & I_DIRTY) &&
|
|
|
|
- mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
|
|
|
|
|
|
+ if (inode->i_state & I_DIRTY) {
|
|
|
|
+ /*
|
|
|
|
+ * Someone redirtied the inode while were writing back
|
|
|
|
+ * the pages.
|
|
|
|
+ */
|
|
|
|
+ redirty_tail(inode);
|
|
|
|
+ } else if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
|
|
/*
|
|
/*
|
|
* We didn't write back all the pages. nfs_writepages()
|
|
* We didn't write back all the pages. nfs_writepages()
|
|
* sometimes bales out without doing anything. Redirty
|
|
* sometimes bales out without doing anything. Redirty
|
|
@@ -494,12 +499,6 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
|
|
inode->i_state |= I_DIRTY_PAGES;
|
|
inode->i_state |= I_DIRTY_PAGES;
|
|
redirty_tail(inode);
|
|
redirty_tail(inode);
|
|
}
|
|
}
|
|
- } else if (inode->i_state & I_DIRTY) {
|
|
|
|
- /*
|
|
|
|
- * Someone redirtied the inode while were writing back
|
|
|
|
- * the pages.
|
|
|
|
- */
|
|
|
|
- redirty_tail(inode);
|
|
|
|
} else if (atomic_read(&inode->i_count)) {
|
|
} else if (atomic_read(&inode->i_count)) {
|
|
/*
|
|
/*
|
|
* The inode is clean, inuse
|
|
* The inode is clean, inuse
|