# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.570   -> 1.571  
#	fs/xfs/pagebuf/page_buf.c	1.3     -> 1.4    
#	 fs/jfs/jfs_logmgr.c	1.33    -> 1.34   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/18	axboe@burns.home.kernel.dk	1.571
# missed updating xfs and jfs to new bi_end_io handling
# --------------------------------------------
#
diff -Nru a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
--- a/fs/jfs/jfs_logmgr.c	Wed Sep 18 16:09:50 2002
+++ b/fs/jfs/jfs_logmgr.c	Wed Sep 18 16:09:50 2002
@@ -1969,13 +1969,16 @@
  *
  * executed at INTIODONE level
  */
-static void lbmIODone(struct bio *bio)
+static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error)
 {
 	struct lbuf *bp = bio->bi_private;
 	struct lbuf *nextbp, *tail;
 	struct jfs_log *log;
 	unsigned long flags;
 
+	if (bio->bi_size)
+		return 1;
+
 	/*
 	 * get back jfs buffer bound to the i/o buffer
 	 */
@@ -2004,7 +2007,7 @@
 		/* wakeup I/O initiator */
 		LCACHE_WAKEUP(&bp->l_ioevent);
 
-		return;
+		return 0;
 	}
 
 	/*
@@ -2029,7 +2032,7 @@
 	if (bp->l_flag & lbmDIRECT) {
 		LCACHE_WAKEUP(&bp->l_ioevent);
 		LCACHE_UNLOCK(flags);
-		return;
+		return 0;
 	}
 
 	tail = log->wqueue;
@@ -2108,6 +2111,8 @@
 
 		LCACHE_UNLOCK(flags);	/* unlock+enable */
 	}
+
+	return 0;
 }
 
 int jfsIOWait(void *arg)
diff -Nru a/fs/xfs/pagebuf/page_buf.c b/fs/xfs/pagebuf/page_buf.c
--- a/fs/xfs/pagebuf/page_buf.c	Wed Sep 18 16:09:50 2002
+++ b/fs/xfs/pagebuf/page_buf.c	Wed Sep 18 16:09:50 2002
@@ -1291,14 +1291,19 @@
 /*
  * Helper routine for pagebuf_iorequest
  */
-STATIC void
+STATIC int
 bio_end_io_pagebuf(
-	struct bio		*bio)
+	struct bio		*bio,
+	unsigned int		bytes_done,
+	int			error)
 {
 	page_buf_t		*pb = (page_buf_t *)bio->bi_private;
 	unsigned int		i, blocksize = pb->pb_target->pbr_blocksize;
 	struct bio_vec		*bvec = bio->bi_io_vec;
 
+	if (bio->bi_size)
+		return 1;
+
 	if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
 		pb->pb_error = EIO;
 
@@ -1335,6 +1340,7 @@
 	}
 
 	bio_put(bio);
+	return 0;
 }
 
 /*