Hello community, here is the log from the commit of package iscsitarget for openSUSE:Factory checked in at 2012-10-31 06:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iscsitarget (Old) and /work/SRC/openSUSE:Factory/.iscsitarget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iscsitarget", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/iscsitarget/iscsitarget.changes 2012-08-27 15:59:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iscsitarget.new/iscsitarget.changes 2012-10-31 06:59:19.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Oct 28 13:29:29 UTC 2012 - [email protected] + +- Modified iscsitarget-kernel-3.5.patch to match upstream version. + +- Added iscsitarget-kernel-3.6.0.patch: fixes compilation issue + in 3.6 kernel: netlink_kernel_create() API changed + +------------------------------------------------------------------- New: ---- iscsitarget-kernel-3.6.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscsitarget.spec ++++++ --- /var/tmp/diff_new_pack.MkAxZh/_old 2012-10-31 06:59:20.000000000 +0100 +++ /var/tmp/diff_new_pack.MkAxZh/_new 2012-10-31 06:59:20.000000000 +0100 @@ -34,6 +34,7 @@ Source3: preamble Source4: services Patch1: iscsitarget-kernel-3.5.patch +Patch2: iscsitarget-kernel-3.6.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %suse_kernel_module_package -n %{name} -p %{S:3} kdump um @@ -58,6 +59,7 @@ %setup -q -n %name-%version-svn %if 0%{?suse_version} > 1220 %patch1 -p1 +%patch2 -p1 %endif echo "iscsi_trgt.ko yes" > kernel/Module.supported ++++++ iscsitarget-kernel-3.5.patch ++++++ --- /var/tmp/diff_new_pack.MkAxZh/_old 2012-10-31 06:59:20.000000000 +0100 +++ /var/tmp/diff_new_pack.MkAxZh/_new 2012-10-31 06:59:20.000000000 +0100 @@ -1,14 +1,78 @@ -Index: iscsitarget-1.4.20.3-svn/kernel/wthread.c -=================================================================== ---- iscsitarget-1.4.20.3-svn/kernel/wthread.c -+++ iscsitarget-1.4.20.3-svn/kernel/wthread.c -@@ -70,7 +70,8 @@ static int worker_thread(void *arg) +From: Arne Redlich <[email protected]> + +Signed-off-by: Arne Redlich <[email protected]> +Signed-off-by: Lee Duncan <[email protected]> +--- + Makefile | 4 ++++ + kernel/wthread.c | 5 ++++- + patches/compat-3.2-3.4.patch | 22 ++++++++++++++++++++++ + 3 files changed, 30 insertions(+), 1 deletion(-) + create mode 100644 patches/compat-3.2-3.4.patch + +diff --git a/Makefile b/Makefile +index 996f645..a3dd653 100644 +--- a/Makefile ++++ b/Makefile +@@ -66,6 +66,10 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0) + # base first the earlier patch sets will not need to be modified. + # + ++ifeq ($(call kver_le,3,4,0),1) ++ PATCHES := $(PATCHES) compat-3.2-3.4.patch ++endif ++ + ifeq ($(call kver_le,3,2,0),1) + PATCHES := $(PATCHES) compat-2.6.39-3.2.patch + endif +diff --git a/kernel/wthread.c b/kernel/wthread.c +index 940de9d..55d7321 100644 +--- a/kernel/wthread.c ++++ b/kernel/wthread.c +@@ -65,13 +65,16 @@ static int worker_thread(void *arg) + struct worker_thread_info *info = wt->w_info; + struct iscsi_cmnd *cmnd; + struct iscsi_conn *conn; ++ + DECLARE_WAITQUEUE(wait, current); + if (current->io_context) put_io_context(current->io_context); - if (!(current->io_context = ioc_task_link(info->wthread_ioc))) -+ ioc_task_link(info->wthread_ioc); -+ if (!(current->io_context = info->wthread_ioc)) ++ if (!info->wthread_ioc) info->wthread_ioc = get_task_io_context(current, GFP_KERNEL, -1); ++ ioc_task_link(info->wthread_ioc); ++ current->io_context = info->wthread_ioc; add_wait_queue(&info->wthread_sleep, &wait); + +diff --git a/patches/compat-3.2-3.4.patch b/patches/compat-3.2-3.4.patch +new file mode 100644 +index 0000000..09160ea +--- /dev/null ++++ b/patches/compat-3.2-3.4.patch +@@ -0,0 +1,22 @@ ++diff --git b/kernel/wthread.c a/kernel/wthread.c ++index 55d7321..940de9d 100644 ++--- b/kernel/wthread.c +++++ a/kernel/wthread.c ++@@ -65,16 +65,13 @@ static int worker_thread(void *arg) ++ struct worker_thread_info *info = wt->w_info; ++ struct iscsi_cmnd *cmnd; ++ struct iscsi_conn *conn; ++- ++ DECLARE_WAITQUEUE(wait, current); ++ ++ if (current->io_context) ++ put_io_context(current->io_context); ++ ++- if (!info->wthread_ioc) +++ if (!(current->io_context = ioc_task_link(info->wthread_ioc))) ++ info->wthread_ioc = get_task_io_context(current, GFP_KERNEL, -1); ++- ioc_task_link(info->wthread_ioc); ++- current->io_context = info->wthread_ioc; ++ ++ add_wait_queue(&info->wthread_sleep, &wait); ++ +-- +1.7.9.5 ++++++ iscsitarget-kernel-3.6.0.patch ++++++ From: Arne Redlich <[email protected]> Signed-off-by: Arne Redlich <[email protected]> Signed-off-by: Lee Duncan <[email protected]> --- Makefile | 4 ++++ kernel/event.c | 13 +++++++++++-- patches/compat-3.5.patch | 24 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 patches/compat-3.5.patch diff --git a/Makefile b/Makefile index a3dd653..df41642 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,10 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0) # base first the earlier patch sets will not need to be modified. # +ifeq ($(call kver_le,3,5,0),1) + PATCHES := $(PATCHES) compat-3.5.patch +endif + ifeq ($(call kver_le,3,4,0),1) PATCHES := $(PATCHES) compat-3.2-3.4.patch endif diff --git a/kernel/event.c b/kernel/event.c index 0266101..1c5f3a4 100644 --- a/kernel/event.c +++ b/kernel/event.c @@ -68,8 +68,17 @@ int event_send(u32 tid, u64 sid, u32 cid, u32 state, int atomic) int event_init(void) { - nl = netlink_kernel_create(&init_net, NETLINK_IET, 1, event_recv_skb, - NULL, THIS_MODULE); + struct netlink_kernel_cfg cfg = { + .groups = 1, + .input = event_recv_skb, + .cb_mutex = NULL, + .bind = NULL, + }; + + nl = netlink_kernel_create(&init_net, + NETLINK_IET, + THIS_MODULE, + &cfg); if (!nl) return -ENOMEM; else diff --git a/patches/compat-3.5.patch b/patches/compat-3.5.patch new file mode 100644 index 0000000..638131e --- /dev/null +++ b/patches/compat-3.5.patch @@ -0,0 +1,24 @@ +diff --git b/kernel/event.c a/kernel/event.c +index 1c5f3a4..0266101 100644 +--- b/kernel/event.c ++++ a/kernel/event.c +@@ -68,17 +68,8 @@ int event_send(u32 tid, u64 sid, u32 cid, u32 state, int atomic) + + int event_init(void) + { +- struct netlink_kernel_cfg cfg = { +- .groups = 1, +- .input = event_recv_skb, +- .cb_mutex = NULL, +- .bind = NULL, +- }; +- +- nl = netlink_kernel_create(&init_net, +- NETLINK_IET, +- THIS_MODULE, +- &cfg); ++ nl = netlink_kernel_create(&init_net, NETLINK_IET, 1, event_recv_skb, ++ NULL, THIS_MODULE); + if (!nl) + return -ENOMEM; + else -- 1.7.9.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
