From 2fb14d255bcf988e72bb46d2e822adf0aa2995c3 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Thu, 10 Oct 2019 16:19:54 +0200 Subject: quick fix patch Signed-off-by: Thiago Abdo --- builder/patches/dnbd3/01-fix | 34 ---------------------------------- builder/patches/dnbd3/01-fix.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 builder/patches/dnbd3/01-fix create mode 100644 builder/patches/dnbd3/01-fix.patch diff --git a/builder/patches/dnbd3/01-fix b/builder/patches/dnbd3/01-fix deleted file mode 100644 index ee4b190b..00000000 --- a/builder/patches/dnbd3/01-fix +++ /dev/null @@ -1,34 +0,0 @@ -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 - - #include - diff --git a/builder/patches/dnbd3/01-fix.patch b/builder/patches/dnbd3/01-fix.patch new file mode 100644 index 00000000..ee4b190b --- /dev/null +++ b/builder/patches/dnbd3/01-fix.patch @@ -0,0 +1,34 @@ +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 + + #include + -- cgit v1.2.3-55-g7522