From: Paul Clements <Paul.Clements@SteelEye.com>

This patch fixes the initial set_capacity call so that it matches nbd's
internal device size (nbd_device->bytesize).



---

 drivers/block/nbd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/block/nbd.c~nbd-set_capacity-fix drivers/block/nbd.c
--- 25/drivers/block/nbd.c~nbd-set_capacity-fix	2004-02-19 12:28:06.000000000 -0800
+++ 25-akpm/drivers/block/nbd.c	2004-02-19 12:28:06.000000000 -0800
@@ -737,7 +737,7 @@ static int __init nbd_init(void)
 		INIT_LIST_HEAD(&nbd_dev[i].queue_head);
 		init_MUTEX(&nbd_dev[i].tx_lock);
 		nbd_dev[i].blksize = 1024;
-		nbd_dev[i].bytesize = ((u64)0x7ffffc00) << 10; /* 2TB */
+		nbd_dev[i].bytesize = 0x7ffffc00ULL << 10; /* 2TB */
 		disk->major = NBD_MAJOR;
 		disk->first_minor = i;
 		disk->fops = &nbd_fops;
@@ -745,7 +745,7 @@ static int __init nbd_init(void)
 		disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
 		sprintf(disk->disk_name, "nbd%d", i);
 		sprintf(disk->devfs_name, "nbd/%d", i);
-		set_capacity(disk, 0x3ffffe);
+		set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */
 		add_disk(disk);
 	}
 

_