Commit 3175e85b authored by Linus Torvalds's avatar Linus Torvalds

v2.4.0.6 -> v2.4.0.7

  - fix inode state comparison bug from ReiserFS merge
parent e73dff56
VERSION = 2 VERSION = 2
PATCHLEVEL = 4 PATCHLEVEL = 4
SUBLEVEL = 1 SUBLEVEL = 1
EXTRAVERSION =-pre6 EXTRAVERSION =-pre7
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
...@@ -141,10 +141,11 @@ void __mark_inode_dirty(struct inode *inode, int flags) ...@@ -141,10 +141,11 @@ void __mark_inode_dirty(struct inode *inode, int flags)
if (sb->s_op && sb->s_op->dirty_inode) if (sb->s_op && sb->s_op->dirty_inode)
sb->s_op->dirty_inode(inode); sb->s_op->dirty_inode(inode);
} }
/* avoid the locking if we can */ /* avoid the locking if we can */
if ((inode->i_state & flags) != flags) { if ((inode->i_state & flags) == flags)
return ; return;
}
spin_lock(&inode_lock); spin_lock(&inode_lock);
if ((inode->i_state & flags) != flags) { if ((inode->i_state & flags) != flags) {
inode->i_state |= flags; inode->i_state |= flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment