patch-2.4.20 linux-2.4.20/drivers/block/loop.c
Next file: linux-2.4.20/drivers/block/paride/epat.c
Previous file: linux-2.4.20/drivers/block/ll_rw_blk.c
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/block/loop.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/drivers/block/loop.c linux-2.4.20/drivers/block/loop.c
@@ -154,7 +154,7 @@
#define MAX_DISK_SIZE 1024*1024*1024
-static unsigned long compute_loop_size(struct loop_device *lo, struct dentry * lo_dentry, kdev_t lodev)
+static int compute_loop_size(struct loop_device *lo, struct dentry * lo_dentry, kdev_t lodev)
{
if (S_ISREG(lo_dentry->d_inode->i_mode))
return (lo_dentry->d_inode->i_size - lo->lo_offset) >> BLOCK_SIZE_BITS;
@@ -483,9 +483,7 @@
goto err;
}
-#if CONFIG_HIGHMEM
- rbh = create_bounce(rw, rbh);
-#endif
+ rbh = blk_queue_bounce(q, rw, rbh);
/*
* file backed, queue for loop_thread to handle
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)