nbd: refresh for context
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch b/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch
index 4783069..adfba09 100644
--- a/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch
+++ b/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch
@@ -1,4 +1,4 @@
-From ef77b515243b3499d62cf446eda6ca7e0a0b079c Mon Sep 17 00:00:00 2001
+From c4fe05b47060bcb19876f6cf6860f05da380f9a7 Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fb.com>
Date: Fri, 2 Dec 2016 16:19:12 -0500
Subject: [PATCH] nbd: use loff_t for blocksize and nbd_set_size args
@@ -12,21 +12,22 @@
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
-index dc722a7adf58..92f5400edbd3 100644
+index a9e398019f38..90a4142d6ece 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
-@@ -64,7 +64,7 @@ struct nbd_device {
- int num_connections;
- atomic_t recv_threads;
- wait_queue_head_t recv_wq;
+@@ -54,7 +54,7 @@ struct nbd_device {
+
+ struct mutex tx_lock;
+ struct gendisk *disk;
- int blksize;
+ loff_t blksize;
loff_t bytesize;
-
- struct task_struct *task_recv;
-@@ -134,7 +134,7 @@ static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev)
+ int xmit_timeout;
+ bool timedout;
+@@ -137,7 +137,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,
@@ -35,7 +36,7 @@
{
int ret;
-@@ -143,7 +143,7 @@ static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,
+@@ -146,7 +146,7 @@ static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,
return ret;
nbd->blksize = blocksize;
@@ -44,10 +45,10 @@
nbd_size_update(nbd, bdev);
-@@ -930,7 +930,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)
+@@ -936,7 +936,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("timeout", 0444, dir, &nbd->xmit_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);
