
From: Chris Mason <mason@suse.com>

reiserfs-writepage-ordered-race needs a minor update to include your latest
__block_write_full_page fixes for the direct_read_under bug Daniel was
hitting.


---

 25-akpm/fs/reiserfs/inode.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/reiserfs/inode.c~reiserfs-writepage-race-fix fs/reiserfs/inode.c
--- 25/fs/reiserfs/inode.c~reiserfs-writepage-race-fix	2004-03-26 10:51:14.765600488 -0800
+++ 25-akpm/fs/reiserfs/inode.c	2004-03-26 10:51:14.769599880 -0800
@@ -2111,7 +2111,7 @@ static int reiserfs_write_full_page(stru
 	/* from this point on, we know the buffer is mapped to a
 	 * real block and not a direct item
 	 */
-	if (wbc->sync_mode != WB_SYNC_NONE) {
+	if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
 	    lock_buffer(bh);
 	} else {
 	    if (test_set_buffer_locked(bh)) {

_
