Re: 2.6.23-rc7-mm1

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jens Axboe
Date: Tuesday, September 25, 2007 - 3:31 am

On Tue, Sep 25 2007, Mel Gorman wrote:

This should fix things up.

diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 8e05ba7..a7fd66a 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -106,14 +106,14 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev,
 			(unsigned long)iter.bio->bi_sector);
 
 		size = bvec->bv_len;
-		buf = bvec_kmap_irq(bvec, flags);
+		buf = bvec_kmap_irq(bvec, &flags);
 		if (gather)
 			memcpy(dev->bounce_buf+offset, buf, size);
 		else
 			memcpy(buf, dev->bounce_buf+offset, size);
 		offset += size;
-		flush_kernel_dcache_page(bio_iovec_idx(bio, j)->bv_page);
-		bio_kunmap_bvec(bvec, flags);
+		flush_kernel_dcache_page(bvec->bv_page);
+		bvec_kunmap_irq(buf, &flags);
 		i++;
 	}
 }

-- 
Jens Axboe

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.23-rc7-mm1, Andrew Morton, (Mon Sep 24, 2:17 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 3:07 am)
2.6.23-rc7-mm1 - 'touch' command causes Oops., Valdis.Kletnieks, (Mon Sep 24, 3:35 am)
Re: 2.6.23-rc7-mm1 - 'touch' command causes Oops., Balbir Singh, (Mon Sep 24, 4:08 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 4:42 am)
Re: 2.6.23-rc7-mm1 - 'touch' command causes Oops., Christoph Hellwig, (Mon Sep 24, 5:05 am)
2.6.23-rc7-mm1 -- s390 compile failures, Andy Whitcroft, (Mon Sep 24, 5:32 am)
Re: 2.6.23-rc7-mm1, Jiri Slaby, (Mon Sep 24, 5:33 am)
2.6.23-rc7-mm1 -- powerpc rtas panic, Andy Whitcroft, (Mon Sep 24, 5:35 am)
Re: 2.6.23-rc7-mm1, Cedric Le Goater, (Mon Sep 24, 5:47 am)
Re: 2.6.23-rc7-mm1 -- s390 compile failures, Cedric Le Goater, (Mon Sep 24, 5:49 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 5:55 am)
Re: 2.6.23-rc7-mm1 - 'touch' command causes Oops., Valdis.Kletnieks, (Mon Sep 24, 5:58 am)
Re: 2.6.23-rc7-mm1, Cedric Le Goater, (Mon Sep 24, 6:00 am)
Re: 2.6.23-rc7-mm1, Cedric Le Goater, (Mon Sep 24, 6:10 am)
Re: 2.6.23-rc7-mm1, Pavel Emelyanov, (Mon Sep 24, 6:10 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 6:13 am)
[PATCH rc7-mm1] fix BUG at mm/swap.c:405!, Hugh Dickins, (Mon Sep 24, 6:17 am)
Re: 2.6.23-rc7-mm1, Balbir Singh, (Mon Sep 24, 6:21 am)
Re: 2.6.23-rc7-mm1, Vlad Yasevich, (Mon Sep 24, 6:29 am)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Alan Stern, (Mon Sep 24, 7:41 am)
Re: 2.6.23-rc7-mm1, Reuben Farrelly, (Mon Sep 24, 7:52 am)
Re: 2.6.23-rc7-mm1 ia64 build issue in efi.c, Bob Picco, (Mon Sep 24, 8:18 am)
Re: 2.6.23-rc7-mm1, Pavel Emelyanov, (Mon Sep 24, 8:34 am)
Re: 2.6.23-rc7-mm1 - 'touch' command causes Oops., Dave Hansen, (Mon Sep 24, 8:45 am)
Re: 2.6.23-rc7-mm1 - 'touch' command causes Oops., Valdis.Kletnieks, (Mon Sep 24, 9:08 am)
Re: 2.6.23-rc7-mm1, Balbir Singh, (Mon Sep 24, 9:10 am)
Re: 2.6.23-rc7-mm1, Andrew Morton, (Mon Sep 24, 9:44 am)
Re: 2.6.23-rc7-mm1, Jens Axboe, (Mon Sep 24, 9:56 am)
Re: 2.6.23-rc7-mm1, Peter Zijlstra, (Mon Sep 24, 9:57 am)
Re: 2.6.23-rc7-mm1, Jens Axboe, (Mon Sep 24, 9:57 am)
Re: 2.6.23-rc7-mm1, Jens Axboe, (Mon Sep 24, 9:58 am)
Re: 2.6.23-rc7-mm1, Andrew Morton, (Mon Sep 24, 9:59 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 10:08 am)
Re: 2.6.23-rc7-mm1, J. Bruce Fields, (Mon Sep 24, 10:12 am)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Jiri Slaby, (Mon Sep 24, 11:45 am)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Alan Stern, (Mon Sep 24, 12:06 pm)
Re: 2.6.23-rc7-mm1, Torsten Kaiser, (Mon Sep 24, 12:07 pm)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Jiri Slaby, (Mon Sep 24, 12:18 pm)
Re: 2.6.23-rc7-mm1, Peter Zijlstra, (Mon Sep 24, 12:20 pm)
Re: 2.6.23-rc7-mm1, Andrew Morton, (Mon Sep 24, 12:34 pm)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 12:41 pm)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Alan Stern, (Mon Sep 24, 12:41 pm)
Re: 2.6.23-rc7-mm1, Thomas Gleixner, (Mon Sep 24, 1:25 pm)
Re: 2.6.23-rc7-mm1, Sam Ravnborg, (Mon Sep 24, 2:02 pm)
Re: 2.6.23-rc7-mm1, Reuben Farrelly, (Mon Sep 24, 2:31 pm)
Re: 2.6.23-rc7-mm1, Sam Ravnborg, (Mon Sep 24, 2:36 pm)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 3:20 pm)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Mon Sep 24, 4:27 pm)
Re: 2.6.23-rc7-mm1, Torsten Kaiser, (Tue Sep 25, 12:32 am)
Re: 2.6.23-rc7-mm1, Thomas Gleixner, (Tue Sep 25, 12:44 am)
Re: 2.6.23-rc7-mm1, Mel Gorman, (Tue Sep 25, 3:23 am)
Re: 2.6.23-rc7-mm1, Jens Axboe, (Tue Sep 25, 3:31 am)
Re: 2.6.23-rc7-mm1, Peter Zijlstra, (Tue Sep 25, 4:05 am)
Re: 2.6.23-rc7-mm1, Mel Gorman, (Tue Sep 25, 4:15 am)
Re: 2.6.23-rc7-mm1, Jens Axboe, (Tue Sep 25, 4:23 am)
Re: 2.6.23-rc7-mm1, Kamalesh Babulal, (Tue Sep 25, 6:07 am)
Re: [linux-usb-devel] 2.6.23-rc7-mm1, Jiri Slaby, (Sun Sep 30, 1:26 am)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Linas Vepstas, (Tue Oct 2, 4:28 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Tony Breeds, (Tue Oct 2, 5:26 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Michael Ellerman, (Tue Oct 2, 5:30 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Tony Breeds, (Tue Oct 2, 6:19 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Michael Ellerman, (Tue Oct 2, 9:09 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Linas Vepstas, (Wed Oct 3, 11:50 am)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Nish Aravamudan, (Thu Oct 4, 5:01 pm)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Linas Vepstas, (Fri Oct 5, 9:03 am)
Re: 2.6.23-rc7-mm1 -- powerpc rtas panic, Nish Aravamudan, (Sun Oct 7, 8:47 pm)