patch-2.4.6 linux/drivers/block/loop.c

• Lines: 33
• Date: Fri Jun 29 16:16:56 2001
• Orig file: v2.4.5/linux/drivers/block/loop.c
• Orig date: Wed Apr 11 19:05:14 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/block/loop.c linux/drivers/block/loop.c
@@ -386,7 +386,7 @@
 	struct buffer_head *bh;
 
 	do {
-		bh = kmem_cache_alloc(bh_cachep, SLAB_BUFFER);
+		bh = kmem_cache_alloc(bh_cachep, SLAB_NOIO);
 		if (bh)
 			break;
 
@@ -408,7 +408,7 @@
 	 * so can we :-)
 	 */
 	do {
-		bh->b_page = alloc_page(GFP_BUFFER);
+		bh->b_page = alloc_page(GFP_NOIO);
 		if (bh->b_page)
 			break;
 
@@ -648,11 +648,11 @@
 	lo->ioctl = NULL;
 	figure_loop_size(lo);
 	lo->old_gfp_mask = inode->i_mapping->gfp_mask;
-	inode->i_mapping->gfp_mask = GFP_BUFFER;
+	inode->i_mapping->gfp_mask = GFP_NOIO;
 
 	bs = 0;
-	if (blksize_size[MAJOR(inode->i_rdev)])
-		bs = blksize_size[MAJOR(inode->i_rdev)][MINOR(inode->i_rdev)];
+	if (blksize_size[MAJOR(lo_device)])
+		bs = blksize_size[MAJOR(lo_device)][MINOR(lo_device)];
 	if (!bs)
 		bs = BLOCK_SIZE;