summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2015-04-02 10:11:37 +0200
committerJens Axboe <axboe@fb.com>2015-04-02 12:39:21 -0600
commitb9c495bb6d8edc719fd23af2ac67de8303cfc1e8 (patch)
treeeb5da0c3bda9b224b8632db4b89e6b5b6c278b04 /drivers/block
parentd06df60b9460838553d37d01049d04c43a36f396 (diff)
downloadblackbird-op-linux-b9c495bb6d8edc719fd23af2ac67de8303cfc1e8.tar.gz
blackbird-op-linux-b9c495bb6d8edc719fd23af2ac67de8303cfc1e8.zip
nbd: Fix device bytesize type
The block subsystem uses loff_t to store the device size. Change the type for nbd_device bytesize to loff_t. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nbd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5bc221693304..7139c8aae7a1 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -32,6 +32,7 @@
#include <net/sock.h>
#include <linux/net.h>
#include <linux/kthread.h>
+#include <linux/types.h>
#include <asm/uaccess.h>
#include <asm/types.h>
@@ -54,7 +55,7 @@ struct nbd_device {
struct mutex tx_lock;
struct gendisk *disk;
int blksize;
- u64 bytesize;
+ loff_t bytesize;
pid_t pid; /* pid of nbd-client, if attached */
int xmit_timeout;
int disconnect; /* a disconnect has been requested by user */
OpenPOWER on IntegriCloud