Signed-off-by: Dushan Tcholich <dusanc@xxxxxxxxx> --- as_ops.c.orig 2007-10-23 11:50:14.000000000 +0200 +++ as_ops.c 2007-10-23 11:52:21.000000000 +0200 @@ -169,7 +169,7 @@ void reiser4_invalidatepage(struct page node = jprivate(page); spin_lock_jnode(node); - if (!(node->state & ((1 << JNODE_DIRTY) | (1<< JNODE_FLUSH_QUEUED) | + if (!(node->state & ((1 << JNODE_DIRTY) | (1 << JNODE_FLUSH_QUEUED) | (1 << JNODE_WRITEBACK) | (1 << JNODE_OVRWR)))) { /* there is not need to capture */ jref(node); @@ -211,7 +211,7 @@ void reiser4_invalidatepage(struct page /* help function called from reiser4_releasepage(). It returns true if jnode * can be detached from its page and page released. */ -int jnode_is_releasable(jnode * node /* node to check */ ) +int jnode_is_releasable(jnode * node/* node to check */) { assert("nikita-2781", node != NULL); assert_spin_locked(&(node->guard)); @@ -219,9 +219,8 @@ int jnode_is_releasable(jnode * node /* /* is some thread is currently using jnode page, later cannot be * detached */ - if (atomic_read(&node->d_count) != 0) { + if (atomic_read(&node->d_count) != 0) return 0; - } assert("vs-1214", !jnode_is_loaded(node));
Signed-off-by: Dushan Tcholich <dusanc@xxxxxxxxx> --- as_ops.c.orig 2007-10-23 11:50:14.000000000 +0200 +++ as_ops.c 2007-10-23 11:52:21.000000000 +0200 @@ -169,7 +169,7 @@ void reiser4_invalidatepage(struct page node = jprivate(page); spin_lock_jnode(node); - if (!(node->state & ((1 << JNODE_DIRTY) | (1<< JNODE_FLUSH_QUEUED) | + if (!(node->state & ((1 << JNODE_DIRTY) | (1 << JNODE_FLUSH_QUEUED) | (1 << JNODE_WRITEBACK) | (1 << JNODE_OVRWR)))) { /* there is not need to capture */ jref(node); @@ -211,7 +211,7 @@ void reiser4_invalidatepage(struct page /* help function called from reiser4_releasepage(). It returns true if jnode * can be detached from its page and page released. */ -int jnode_is_releasable(jnode * node /* node to check */ ) +int jnode_is_releasable(jnode * node/* node to check */) { assert("nikita-2781", node != NULL); assert_spin_locked(&(node->guard)); @@ -219,9 +219,8 @@ int jnode_is_releasable(jnode * node /* /* is some thread is currently using jnode page, later cannot be * detached */ - if (atomic_read(&node->d_count) != 0) { + if (atomic_read(&node->d_count) != 0) return 0; - } assert("vs-1214", !jnode_is_loaded(node));