Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7599166d authored by Josef Bacik's avatar Josef Bacik Committed by Greg Kroah-Hartman
Browse files

nbd: use loff_t for blocksize and nbd_set_size args 



commit ef77b515243b3499d62cf446eda6ca7e0a0b079c upstream.

If we have large devices (say like the 40t drive I was trying to test with) we
will end up overflowing the int arguments to nbd_set_size and not get the right
size for our device.  Fix this by using loff_t everywhere so I don't have to
think about this again.  Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
[bwh: Backported to 4.9: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c0c4352

drivers/block/nbd.c

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct nbd_device { 


	struct mutex tx_lock;

	struct gendisk *disk;

	int blksize;

	loff_t blksize;

	loff_t bytesize;



	/* protects initialization and shutdown of the socket */
@@ -126,7 +126,7 @@ static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev) 
}



static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,

			int blocksize, int nr_blocks)

			loff_t blocksize, loff_t nr_blocks)

{

	int ret;
@@ -135,7 +135,7 @@ static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev, 
		return ret;



	nbd->blksize = blocksize;

	nbd->bytesize = (loff_t)blocksize * (loff_t)nr_blocks;

	nbd->bytesize = blocksize * nr_blocks;



	nbd_size_update(nbd, bdev);
@@ -817,7 +817,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) 
	debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_ops);

	debugfs_create_u64("size_bytes", 0444, dir, &nbd->bytesize);

	debugfs_create_u32("timeout", 0444, dir, &nbd->tag_set.timeout);

	debugfs_create_u32("blocksize", 0444, dir, &nbd->blksize);

	debugfs_create_u64("blocksize", 0444, dir, &nbd->blksize);

	debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_ops);



	return 0;