v2.4.0.6 -> v2.4.0.7

- fix inode state comparison bug from ReiserFS merge

v2.4.0.6 -> v2.4.0.7
- fix inode state comparison bug from ReiserFS merge
3175e85b · Linus Torvalds · e73dff56 · 3175e85b · 3175e85b
Commit 3175e85b authored Feb 04, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

Makefile Makefile +1 -1

fs/inode.c fs/inode.c +4 -3

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 1
-EXTRAVERSION =-pre6
+EXTRAVERSION =-pre7
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

--- a/fs/inode.c
+++ b/fs/inode.c
@@ -141,10 +141,11 @@ void __mark_inode_dirty(struct inode *inode, int flags)
 			if (sb->s_op && sb->s_op->dirty_inode)
 				sb->s_op->dirty_inode(inode);
 		}
 		/* avoid the locking if we can */
-		if ((inode->i_state & flags) != flags) {
+		if ((inode->i_state & flags) == flags)
-			return ;
+			return;
-		}
 		spin_lock(&inode_lock);
 		if ((inode->i_state & flags) != flags) {
 			inode->i_state |= flags;