[PATCH] loop device broken in 2.5.38

From: tytso@mit.edu
Date: Wed Sep 25 2002 - 12:35:06 EST


The loop device driver was broken in 2.5.38 when it was converted over
to use gendisk. I discovered this while doing final regression testing
on the ext3 htree code.

The problem is that figure_loop_size() is setting the capacity of the
loop device in kilobytes (because that's what compute_loop_size()
returns), but set_capacity() expects the size in 512 byte sectors.

I've enclosed a patch which fixes the problem, as well as simplifying
the code by eliminating compute_loop_size(), since it is a static
function is only used once by figure_loop_size().

                                                - Ted

===== drivers/block/loop.c 1.57 vs edited =====
--- 1.57/drivers/block/loop.c Sat Sep 21 02:08:48 2002
+++ edited/drivers/block/loop.c Wed Sep 25 13:28:37 2002
@@ -157,18 +157,12 @@
 
 #define MAX_DISK_SIZE 1024*1024*1024
 
-static unsigned long
-compute_loop_size(struct loop_device *lo, struct dentry * lo_dentry)
-{
- loff_t size = lo_dentry->d_inode->i_mapping->host->i_size;
- return (size - lo->lo_offset) >> BLOCK_SIZE_BITS;
-}
-
 static void figure_loop_size(struct loop_device *lo)
 {
- set_capacity(disks + lo->lo_number, compute_loop_size(lo,
- lo->lo_backing_file->f_dentry));
-
+ loff_t size = lo->lo_backing_file->f_dentry->d_inode->i_size;
+
+ set_capacity(disks + lo->lo_number,
+ (size - lo->lo_offset) >> (BLOCK_SIZE_BITS-1));
 }
 
 static inline int lo_do_transfer(struct loop_device *lo, int cmd, char *rbuf,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Sep 30 2002 - 22:00:23 EST