summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Robra2019-10-20 13:17:01 +0200
committerFrederic Robra2019-10-20 13:17:01 +0200
commit0aa62e8baa5573caf40567832296ad77bc95f03d (patch)
treecac2367ef121f853c5a4358c2bcb3f96ff28ebcc
parentadded client configuration for number connections (diff)
downloaddnbd3-ng-0aa62e8baa5573caf40567832296ad77bc95f03d.tar.gz
dnbd3-ng-0aa62e8baa5573caf40567832296ad77bc95f03d.tar.xz
dnbd3-ng-0aa62e8baa5573caf40567832296ad77bc95f03d.zip
patch from Thiago Abdo, casts and includ
-rw-r--r--src/kernel/mq.c4
-rw-r--r--src/kernel/net-txrx.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/kernel/mq.c b/src/kernel/mq.c
index 5fa34d5..d83f7e4 100644
--- a/src/kernel/mq.c
+++ b/src/kernel/mq.c
@@ -49,7 +49,7 @@ unsigned long dnbd3_is_mq_busy(struct dnbd3_device *dev)
struct blk_mq_tag_set *set = &dev->tag_set;
unsigned long busy = 0;
- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter, &busy);
+ blk_mq_tagset_busy_iter(set, (busy_tag_iter_fn *)dnbd3_busy_iter, &busy);
/*
* just for demonstration
@@ -86,7 +86,7 @@ static void dnbd3_busy_iter_requeue(struct request *req, void *priv, bool arg)
void dndb3_reque_busy_requests(struct dnbd3_sock *sock)
{
struct blk_mq_tag_set *set = &sock->device->tag_set;
- blk_mq_tagset_busy_iter(set, dnbd3_busy_iter_requeue, sock);
+ blk_mq_tagset_busy_iter(set,(busy_tag_iter_fn *) dnbd3_busy_iter_requeue, sock);
}
diff --git a/src/kernel/net-txrx.c b/src/kernel/net-txrx.c
index 3d2cc7c..a0d75bb 100644
--- a/src/kernel/net-txrx.c
+++ b/src/kernel/net-txrx.c
@@ -23,6 +23,7 @@
#include "utils.h"
#include "clientconfig.h"
#include "mq.h"
+#include <linux/signal.h>
#include <net/sock.h>