Hello community, here is the log from the commit of package iscsitarget checked in at Tue Nov 27 18:56:54 CET 2007. -------- --- iscsitarget/iscsitarget.changes 2007-10-23 13:21:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/iscsitarget/iscsitarget.changes 2007-11-27 18:24:19.540312000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 27 18:24:15 CET 2007 - ro@suse.de + +- make it build with 2.6.24 + +------------------------------------------------------------------- New: ---- iscsitarget-2.6.24.diff preamble ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscsitarget.spec ++++++ --- /var/tmp/diff_new_pack.I12448/_old 2007-11-27 18:50:56.000000000 +0100 +++ /var/tmp/diff_new_pack.I12448/_new 2007-11-27 18:50:56.000000000 +0100 @@ -13,20 +13,21 @@ Name: iscsitarget BuildRequires: kernel-source kernel-syms module-init-tools openssl-devel Url: http://iscsitarget.sourceforge.net -License: LGPL v2 or later +License: GPL v2 only Group: System/Daemons PreReq: %fillup_prereq %insserv_prereq /bin/cat /bin/rm AutoReqProv: on Version: 0.4.15 -Release: 2 +Release: 10 Requires: kernel Summary: Open Source iSCSI Target with Professional Features Source: %{name}-%{version}.tar.gz Source1: %{name}.init Patch1: %{name}-%{version}-netlink.diff Patch2: %{name}-%{version}-kmem_cache_create.diff +Patch3: iscsitarget-2.6.24.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%suse_kernel_module_package -n %{name} kdump um +%suse_kernel_module_package -n %{name} -p %_sourcedir/preamble kdump um %description The aim of the project is to develop an open source iSCSI target with @@ -42,7 +43,7 @@ %package KMP Group: System/Daemons -License: LGPL v2 or later +License: LGPL v2.1 or later Summary: Open Source iSCSI Target with Professional Features %description KMP @@ -61,6 +62,7 @@ %setup %patch1 -p1 %patch2 -p1 +%patch3 %build %{__make} CFLAGS="${RPM_OPT_FLAGS} -I../include" bindir=/usr/sbin usr @@ -106,7 +108,10 @@ %doc COPYING README %doc %{_mandir}/man5/* %doc %{_mandir}/man8/* + %changelog +* Tue Nov 27 2007 - ro@suse.de +- make it build with 2.6.24 * Tue Oct 23 2007 - ro@suse.de - add KMP subpackage to transport metadata for kmp subpacks * Sat Oct 20 2007 - jeffm@suse.com ++++++ iscsitarget-2.6.24.diff ++++++ --- kernel/digest.c +++ kernel/digest.c @@ -163,9 +163,8 @@ /* Copied from linux-iscsi initiator and slightly adjusted */ #define SETSG(sg, p, l) do { \ - (sg).page = virt_to_page((p)); \ - (sg).offset = ((unsigned long)(p) & ~PAGE_CACHE_MASK); \ - (sg).length = (l); \ + sg_set_page(&(sg), virt_to_page(p), (l), \ + ((unsigned long)(p) & ~PAGE_CACHE_MASK)); \ } while (0) static void digest_header(struct hash_desc *hash, struct iscsi_pdu *pdu, @@ -228,9 +227,7 @@ else length = size; - sg[i].page = tio->pvec[idx + i]; - sg[i].offset = offset; - sg[i].length = length; + sg_set_page(&sg[i], tio->pvec[idx + i], length, offset); size -= length; offset = 0; } --- kernel/event.c +++ kernel/event.c @@ -28,7 +28,7 @@ return 0; } -static int event_recv_skb(struct sk_buff *skb) +static void event_recv_skb(struct sk_buff *skb) { int err; struct nlmsghdr *nlh; @@ -37,7 +37,7 @@ while (skb->len >= NLMSG_SPACE(0)) { nlh = (struct nlmsghdr *)skb->data; if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) - return 0; + return; rlen = NLMSG_ALIGN(nlh->nlmsg_len); if (rlen > skb->len) rlen = skb->len; @@ -47,10 +47,9 @@ netlink_ack(skb, nlh, 0); skb_pull(skb, rlen); } - return 0; } -static void event_recv(struct sock *sk, int length) +/* static void event_recv(struct sock *sk, int length) { struct sk_buff *skb; @@ -61,6 +60,7 @@ kfree_skb(skb); } } +*/ static int notify(void *data, int len, int gfp_mask) { @@ -95,7 +95,7 @@ int event_init(void) { - nl = netlink_kernel_create(NETLINK_IET, 1, event_recv, NULL, THIS_MODULE); + nl = netlink_kernel_create(&init_net, NETLINK_IET, 1, event_recv_skb, NULL, THIS_MODULE); if (!nl) return -ENOMEM; else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org