git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[pandora-kernel.git]
/
fs
/
fs-writeback.c
diff --git
a/fs/fs-writeback.c
b/fs/fs-writeback.c
index
40308e9
..
caf0491
100644
(file)
--- a/
fs/fs-writeback.c
+++ b/
fs/fs-writeback.c
@@
-321,7
+321,7
@@
__sync_single_inode(struct inode *inode, struct writeback_control *wbc)
spin_lock(&inode_lock);
inode->i_state &= ~I_SYNC;
spin_lock(&inode_lock);
inode->i_state &= ~I_SYNC;
- if (!(inode->i_state &
I_FREEING
)) {
+ 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) &&
mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
/*
@@
-492,7
+492,7
@@
void generic_sync_sb_inodes(struct super_block *sb,
break;
}
break;
}
- if (inode->i_state &
I_NEW
) {
+ if (inode->i_state &
(I_NEW | I_WILL_FREE)
) {
requeue_io(inode);
continue;
}
requeue_io(inode);
continue;
}
@@
-523,7
+523,7
@@
void generic_sync_sb_inodes(struct super_block *sb,
if (current_is_pdflush() && !writeback_acquire(bdi))
break;
if (current_is_pdflush() && !writeback_acquire(bdi))
break;
- BUG_ON(inode->i_state &
I_FREEING
);
+ BUG_ON(inode->i_state &
(I_FREEING | I_CLEAR)
);
__iget(inode);
pages_skipped = wbc->pages_skipped;
__writeback_single_inode(inode, wbc);
__iget(inode);
pages_skipped = wbc->pages_skipped;
__writeback_single_inode(inode, wbc);