--- drivers/md/dm-loop.c.rel	2007-01-22 09:45:04.000000000 +0000
+++ drivers/md/dm-loop.c	2007-01-22 09:45:10.000000000 +0000
@@ -22,7 +22,7 @@
 #include "dm-bio-record.h"
 
 #define DM_MSG_PREFIX "loop"
-#define LOOP_MAX_EXTENTS 1024
+#define LOOP_MAX_EXTENTS 2048
 
 #define	DMLOOP_READONLY	0x01
 #define	DMLOOP_SYNC	0x02
@@ -69,7 +69,7 @@ struct loop_c {
 };
 
 #ifdef CONFIG_DM_DEBUG
-static void dump_extent(struct extent *e)
+static void dump_extent(unsigned i, struct extent *e)
 {
 	const char types[] = { 'f', 'd' };
 
@@ -81,8 +81,8 @@ static void dump_extent(struct extent *e
 		return;
 	}
 
-	DMDEBUG("start: %8llu len: %4llu %4c.rstart: %8llu",
-				e->start, e->len, types[e->type],
+	DMDEBUG(" [%u] start: %8llu len: %4llu %4c.rstart: %8llu",
+				i, e->start, e->len, types[e->type],
 				(sector_t)e->data );
 }
 
@@ -97,7 +97,7 @@ static void dump_extent_map(struct exten
 			map->nr_extents, map->cur_extent);
 
 	for (i = 0; i < map->nr_extents; i++)
-		dump_extent(DMLOOP_EXTENT(i));
+		dump_extent(i, DMLOOP_EXTENT(i));
 }
 
 #else /* CONFIG_DM_DEBUG */
@@ -228,16 +228,25 @@ reprobe:
 		continue;
 	}
 
+	if (nr_extents == LOOP_MAX_EXTENTS && probe_block < last_block){
+		DMERR("Loopfile contains more than LOOP_MAX_EXTENTS (%d) fragments\n",
+					LOOP_MAX_EXTENTS);
+		goto out_free;
+	}
+
 	map->nr_extents = nr_extents;
 	map->cur_extent = 0;
 
 	DMDEBUG("created initial extent map, finalizing.");
 	map = finalize_map(map);
+	if (!map)
+		return -ENOMEM;
+
+	//dump_extent_map(map);
 	DMINFO("Finalized extent map of %u bytes, %d entries.",
 			(map->nr_extents * sizeof(struct extent)),
 			map->nr_extents);
 
-	dump_extent_map(map);
 	lc->blkbits = blkbits;
 	lc->map = map;
 
@@ -408,7 +417,7 @@ static struct file *loop_get_file(char *
 {
 	struct file *filp;
 	struct inode *inode;
-	int r;
+	int r = 0;
 
 	filp = filp_open(loop_path,
 			 ((*flags & DMLOOP_READONLY) ? O_RDONLY : O_RDWR) |
@@ -434,6 +443,7 @@ static struct file *loop_get_file(char *
 
 	if (IS_SWAPFILE(inode)) {
 		DMERR("file is already in use: %s", loop_path);
+		r = -EBUSY;
 		goto out;
 	}
 
@@ -461,7 +471,7 @@ static int loop_setup_size(struct loop_c
 	lc->size = i_size_read(inode);
 	lc->blkbits = inode->i_blkbits;
 
-	if (lc->offset & (1 << lc->blkbits - 1)) {
+	if (lc->offset & ((1 << lc->blkbits) - 1)) {
 		DMERR("Backing file offset of %lld bytes not a multiple of "
 			"filesystem blocksize (%d)", lc->offset,
 			1 << lc->blkbits);
@@ -565,8 +575,11 @@ static int loop_ctr(struct dm_target *ti
 		goto out_putf;
 
 	r = setup_loop_extents(lc);
-	if (r) {
-		ti->error = "Could not create extent map";
+	if (r == -EINVAL) {
+		ti->error = "Could not create extent map - invalid argument";
+		goto out_putf;
+	} else if (r == -ENOMEM) {
+		ti->error = "Could not allocate extent map";
 		goto out_putf;
 	}