patch-2.4.0-test5 linux/mm/highmem.c

• Lines: 39
• Date: Thu Jul 27 16:47:16 2000
• Orig file: v2.4.0-test4/linux/mm/highmem.c
• Orig date: Tue May 23 15:31:37 2000

diff -u --recursive --new-file v2.4.0-test4/linux/mm/highmem.c linux/mm/highmem.c
@@ -240,8 +240,6 @@
  * This will be moved to the block layer in 2.5.
  */
 
-extern kmem_cache_t *bh_cachep;
-
 static inline void copy_from_high_bh (struct buffer_head *to,
 			 struct buffer_head *from)
 {
@@ -281,7 +279,7 @@
 
 static inline void bounce_end_io (struct buffer_head *bh, int uptodate)
 {
-	struct buffer_head *bh_orig = (struct buffer_head *)(bh->b_dev_id);
+	struct buffer_head *bh_orig = (struct buffer_head *)(bh->b_private);
 
 	bh_orig->b_end_io(bh_orig, uptodate);
 	__free_page(bh->b_page);
@@ -295,7 +293,7 @@
 
 static void bounce_end_io_read (struct buffer_head *bh, int uptodate)
 {
-	struct buffer_head *bh_orig = (struct buffer_head *)(bh->b_dev_id);
+	struct buffer_head *bh_orig = (struct buffer_head *)(bh->b_private);
 
 	if (uptodate)
 		copy_to_high_bh_irq(bh_orig, bh);
@@ -354,10 +352,9 @@
 		copy_from_high_bh(bh, bh_orig);
 	} else
 		bh->b_end_io = bounce_end_io_read;
-	bh->b_dev_id = (void *)bh_orig;
+	bh->b_private = (void *)bh_orig;
 	bh->b_rsector = bh_orig->b_rsector;
 	memset(&bh->b_wait, -1, sizeof(bh->b_wait));
-	bh->b_kiobuf = NULL;
 
 	return bh;
 }