Bug#685422: Bug#687925: diff for NMU version 1.4.20.2-10.1
Hello Release Team, We have 3 bugs for iscsitarget, which if permitted, would be good to see go in for Wheezy. These are: 687925 - This one. Fixes a session lock problem. Checked upstream and shouldn't create regressions. 687619 - This one has a 1 liner change, bumping the max_connections to 256. 685422 - Another corner case, where in if you fire a ata smart command to the iet disk, the kernel panics on the target. This is already part of the upstream stable branch. Loic already has NMUed for 687925, which should land soon into unstable. If you consider all 3 to be okay, please drop a note. I can then prepare the final patch with all 3 bugs fixes. PS: I have already sent you the diff for 685422 in the other email (still attached here). And 687619 is just a one liner. -#define INCOMING_MAX 32 + +/* + changed INCOMING_MAX from 32 to 256 since we have seen initiators unable + to login (connection RST) during the login phase + + http://blog.wpkg.org/2007/09/09/solving-reliability-and-scalability-problems-with-iscsi/ +*/ +#define INCOMING_MAX 255 On Monday 17 September 2012 10:28 PM, Ritesh Raj Sarraf wrote: > On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: >> The proposed NMU was based on the assumption that it would be easier to fix >> the release critical bug first and >> then advocate for other changes: >> > Agreed. Just that the other bug, that the one in experimental fixes, is > related to a kernel panic. It is still a minor bug though. > >> a) ask for an unblock of -10.1 fixing solely RC#687925 >> b) discuss -11 while -10.1 migrates to testing >> proceed as in b) to f) above. >> > Just in case we can push for both, well and good. Otherwise, advocate > for this one. I am okay with either bug squashed. > >> I am concerned that including the publication of the resolution of RC#687925 >> ( which blocks the installation >> of the nova-volume package which is essential to the successfull deployment >> of the entire OpenStack solution ) into a >> larger discussion will involve a significant delay, maybe weeks, while the >> other changes are debated. >> >> Thanks a lot for your work with the iscsitarget package : I use it daily :-) > -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System --- Begin Message --- Dear Release Team, There is a minor bug (685422) reported against the iscsitarget package. I have fixed this in experimental, for now. I know this is late, but just wanted to check if the exceptions are still allowed. The diff in between the version in Wheezy and the fixed one is Experimental is attached. Thanks, Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System diff --git a/debian/changelog b/debian/changelog index 957132a..d79aab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +iscsitarget (1.4.20.2-11) experimental; urgency=low + + * [6dfdd7c] Add iscsitarget-dkms to Recommends and drop iscsitarget-module + * [281b4a4] Update README.Debian explaining the new DKMS package. +Thanks to Olaf van der Spek (Closes: #668382) + * [a0d484c] Drop patch fix-build-3-2.patch + * [afdf1df] Add patches from 1.4.20 stable branch (Closes: #685422) + + -- Ritesh Raj Sarraf Sat, 15 Sep 2012 12:55:24 +0530 + iscsitarget (1.4.20.2-10) unstable; urgency=low * [2bebbc2] don't prompt on modified conffiles. diff --git a/debian/patches/0001-Makefile-changes-to-support-3.x-kernels.patch b/debian/patches/0001-Makefile-changes-to-support-3.x-kernels.patch new file mode 100644 index 000..d35f3f1 --- /dev/null +++ b/debian/patches/0001-Makefile-changes-to-support-3.x-kernels.patch @@ -0,0 +1,50 @@ +From 4c3800c953722c6c39d0b47dc87289ed63c34aa8 Mon Sep 17 00:00:00 2001 +From: agr1 +Date: Sat, 3 Sep 2011 11:51:08 + +Subject: [PATCH 1/3] Makefile changes to support 3.x kernels + +This patch was provided by Leho Kraav + +Signed-off-by: Arne Redlich + +git-svn-id: https://iscsitarget.svn.sourceforge.net/svnroot/iscsitarget/branches/1.4.20@454 48a34bb2-7106-0410-bc49-8aa7273d22a1 +--- + Makefile | 18 +- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 02ba273..b47f689 100644 +--- a/Makefile b/Makefile +@@ -40,15 +40,23 @@ KMIN := $(shell echo $(KVER) | \ + KREV := $(shell echo $(KVER) | \ + sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/') + +-kver_eq = $(shell [ $(KMAJ)$(KMIN)$(KREV) -eq $(1)$(2)$(3) ] && \ ++kver_eq = $(shell [ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -eq $(3) ] && \ + echo 1 || echo 0) +-kver_lt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -lt $(1)$(2)$(3) ] && \ ++kver_lt = $(shell [ $(KMAJ) -lt $(1) -o \ ++ $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \ ++$(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -lt $(3) ] && \ + echo 1 || echo 0) +-kver_le = $(shell [ $(KMAJ)$(KMIN)$(KREV) -le $(1)$(2)$(3) ] && \ ++kver_le = $(shell [ $(KMAJ) -lt $(1) -o \
Bug#687925: diff for NMU version 1.4.20.2-10.1
2012/9/17 Ritesh Raj Sarraf : > Hello Arne / Ross, > > This debian bug, 687925, is release critical for the OpenStack suite. > OpenStack uses iscsitarget as its storage sub-module. > > As is explained in this bug report, the ietd daemon does not seem to be > releasing the sparse files that it exposes to the initiator, even after > the initiator has logged out the sessions. > > This fix, in revision 478, is not part of the stable 1.4.20 branch. > > Debian is in freeze now, and the iscsitarget version that will ship with > Wheezy is the 1.4.20.2 stable branch. > > Is it safe to pick this one fix against the stable branch? Ritesh, It should be safe. ISTR that I didn't put it into the 1.4.20 stable branch immediately as I didn't get around to testing it against older kernels (< 2.6.35) back then. Exercising the steps outlined in [1] in a ubuntu 10.04.4 vm with 2.6.32-42-server with this patch in place didn't show any regressions, so I just cherry-picked and pushed it to our 1.4.20 branch as well. HTH, Arne [1] https://bugs.launchpad.net/ubuntu/+source/iscsitarget/+bug/967984 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#687925: diff for NMU version 1.4.20.2-10.1
I have been so busy at my day job I have been negligent of the IET code base. The bug was fixed in HEAD and not ported to 1.4.20 branch? If we release 1.4.20.3 you can probably push that through as an update as it's bug-fix only? Otherwise what you propose is less-stable that an official bug release. -Ross > -Original Message- > From: Ritesh Raj Sarraf [mailto:r...@researchut.com] On Behalf Of Ritesh > Raj Sarraf > Sent: Monday, September 17, 2012 4:49 PM > To: Arne Redlich; Ross S. W. Walker > Cc: Loic Dachary; 687...@bugs.debian.org > Subject: Re: Bug#687925: diff for NMU version 1.4.20.2-10.1 > > Hello Arne / Ross, > > This debian bug, 687925, is release critical for the OpenStack suite. > OpenStack uses iscsitarget as its storage sub-module. > > As is explained in this bug report, the ietd daemon does not seem to be > releasing the sparse files that it exposes to the initiator, even after > the initiator has logged out the sessions. > > This fix, in revision 478, is not part of the stable 1.4.20 branch. > > Debian is in freeze now, and the iscsitarget version that will ship with > Wheezy is the 1.4.20.2 stable branch. > > Is it safe to pick this one fix against the stable branch? > > > Thanks, > Ritesh > > > On Monday 17 September 2012 11:48 PM, Loic Dachary wrote: > > On 09/17/2012 07:41 PM, Ritesh Raj Sarraf wrote: > >> On Monday 17 September 2012 10:28 PM, Ritesh Raj Sarraf wrote: > >>> On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: > >>>>> The proposed NMU was based on the assumption that it would be > >>>>> easier to fix the release critical bug first and then advocate for > other changes: > >>>>> > >>> Agreed. Just that the other bug, that the one in experimental fixes, > >>> is related to a kernel panic. It is still a minor bug though. > >>> > >> I also would have preferred to see this fix in the 1.4.20 stable > >> branch upstream. When I pulled in the bits yesterday, this fix was > >> not in the stable branch. Have you asked this upstream? > >> > > Hi, > > > > I'm not familiar with the iscsitarget upstream. The patch comes from > > this upstream revision > > > > http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478 > > &view=revision > > > > and the rationale for applying it is described in detail in > > > > https://launchpad.net/bugs/967984 > > > > Does that answer your question ? > > > > Cheers > > > > > -- > Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal > Operating System __ This e-mail, and any attachments thereto, is intended only for use by the addressee(s) named herein and may contain legally privileged and/or confidential information. If you are not the intended recipient of this e-mail, you are hereby notified that any dissemination, distribution or copying of this e-mail, and any attachments thereto, is strictly prohibited. If you have received this e-mail in error, please immediately notify the sender and permanently delete the original and any copy or printout thereof.
Bug#687925: diff for NMU version 1.4.20.2-10.1
Hello Arne / Ross, This debian bug, 687925, is release critical for the OpenStack suite. OpenStack uses iscsitarget as its storage sub-module. As is explained in this bug report, the ietd daemon does not seem to be releasing the sparse files that it exposes to the initiator, even after the initiator has logged out the sessions. This fix, in revision 478, is not part of the stable 1.4.20 branch. Debian is in freeze now, and the iscsitarget version that will ship with Wheezy is the 1.4.20.2 stable branch. Is it safe to pick this one fix against the stable branch? Thanks, Ritesh On Monday 17 September 2012 11:48 PM, Loic Dachary wrote: > On 09/17/2012 07:41 PM, Ritesh Raj Sarraf wrote: >> On Monday 17 September 2012 10:28 PM, Ritesh Raj Sarraf wrote: >>> On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: > The proposed NMU was based on the assumption that it would be easier to > fix the release critical bug first and > then advocate for other changes: > >>> Agreed. Just that the other bug, that the one in experimental fixes, is >>> related to a kernel panic. It is still a minor bug though. >>> >> I also would have preferred to see this fix in the 1.4.20 stable branch >> upstream. When I pulled in the bits yesterday, this fix was not in the >> stable branch. Have you asked this upstream? >> > Hi, > > I'm not familiar with the iscsitarget upstream. The patch comes from this > upstream revision > > http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision > > and the rationale for applying it is described in detail in > > https://launchpad.net/bugs/967984 > > Does that answer your question ? > > Cheers > -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
On 09/17/2012 07:41 PM, Ritesh Raj Sarraf wrote: > On Monday 17 September 2012 10:28 PM, Ritesh Raj Sarraf wrote: >> On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: The proposed NMU was based on the assumption that it would be easier to fix the release critical bug first and then advocate for other changes: >> Agreed. Just that the other bug, that the one in experimental fixes, is >> related to a kernel panic. It is still a minor bug though. >> > I also would have preferred to see this fix in the 1.4.20 stable branch > upstream. When I pulled in the bits yesterday, this fix was not in the > stable branch. Have you asked this upstream? > Hi, I'm not familiar with the iscsitarget upstream. The patch comes from this upstream revision http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision and the rationale for applying it is described in detail in https://launchpad.net/bugs/967984 Does that answer your question ? Cheers <> signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
On Monday 17 September 2012 10:28 PM, Ritesh Raj Sarraf wrote: > On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: >> > The proposed NMU was based on the assumption that it would be easier to >> > fix the release critical bug first and >> > then advocate for other changes: >> > > Agreed. Just that the other bug, that the one in experimental fixes, is > related to a kernel panic. It is still a minor bug though. > I also would have preferred to see this fix in the 1.4.20 stable branch upstream. When I pulled in the bits yesterday, this fix was not in the stable branch. Have you asked this upstream? -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
On Monday 17 September 2012 08:41 PM, Loic Dachary wrote: > The proposed NMU was based on the assumption that it would be easier to fix > the release critical bug first and > then advocate for other changes: > Agreed. Just that the other bug, that the one in experimental fixes, is related to a kernel panic. It is still a minor bug though. > a) ask for an unblock of -10.1 fixing solely RC#687925 > b) discuss -11 while -10.1 migrates to testing > proceed as in b) to f) above. > Just in case we can push for both, well and good. Otherwise, advocate for this one. I am okay with either bug squashed. > I am concerned that including the publication of the resolution of RC#687925 > ( which blocks the installation > of the nova-volume package which is essential to the successfull deployment > of the entire OpenStack solution ) into a > larger discussion will involve a significant delay, maybe weeks, while the > other changes are debated. > > Thanks a lot for your work with the iscsitarget package : I use it daily :-) -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi,
Here is the patch, rebased against 1.4.20.2-11
Cheers
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAlBXRdEACgkQ8dLMyEl6F20q4wCgll9G1Vcrgc8254LumI2gk722
CPYAnRvQEQBcyC57x7yZH5zhHG4QEgE1
=wrJx
-END PGP SIGNATURE-
diff --git a/debian/changelog b/debian/changelog
index d79aab8..b581cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-iscsitarget (1.4.20.2-11) experimental; urgency=low
+iscsitarget (1.4.20.2-11) UNRELEASED; urgency=low
+ [ Ritesh Raj Sarraf ]
* [6dfdd7c] Add iscsitarget-dkms to Recommends and drop iscsitarget-module
* [281b4a4] Update README.Debian explaining the new DKMS package.
Thanks to Olaf van der Spek (Closes: #668382)
* [a0d484c] Drop patch fix-build-3-2.patch
* [afdf1df] Add patches from 1.4.20 stable branch (Closes: #685422)
- -- Ritesh Raj Sarraf Sat, 15 Sep 2012 12:55:24 +0530
+ [ Loic Dachary (OuoU) ]
+
+ * Fixes ietadm not detecting inactive sessions (Closes: #687925).
+
+ --
iscsitarget (1.4.20.2-10) unstable; urgency=low
diff --git a/debian/patches/inactive-sessions.patch b/debian/patches/inactive-sessions.patch
new file mode 100644
index 000..839f762
--- /dev/null
+++ b/debian/patches/inactive-sessions.patch
@@ -0,0 +1,83 @@
+Description: ietadm not detecting inactive sessions
+ Once 1.4.20.3 is released, this patch can be dropped, it is commited at
+ http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision
+ .
+ Fix retrieval of ietd pid from netlink
+ .
+ The ietd pid was retrieved from the credentials in the netlink skb
+ which happened to work with kernels < 3.2. These days the credentials
+ are not sent by default anymore (and ietd doesn't fill them in) so
+ the pid needs to be determined from the netlink_skb_parms.
+ .
+ This fixes a bug reported by Clay Gerrard ("Can't delete target after
+ initiator logs out", caused by the session removal event not making it
+ to ietd).
+ .
+Author: Arne Redlich
+Reviewed-by: Loic Dachary
+Last-Update: 2012-09-17
+Applied-Upstream: http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision
+Bug-Debian: http://bugs.debian.org/687925
+Bug-Ubuntu: https://launchpad.net/bugs/967984
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: ,
+Bug:
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded:
+Reviewed-By:
+Last-Update:
+
+--- trunk/kernel/event.c 2012/04/03 18:19:28 477
trunk/kernel/event.c 2012/04/06 21:58:31 478
+@@ -14,24 +14,8 @@
+ static struct sock *nl;
+ static u32 ietd_pid;
+
+-static int event_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+-{
+- u32 uid, pid, seq;
+- char *data;
+-
+- pid = NETLINK_CREDS(skb)->pid;
+- uid = NETLINK_CREDS(skb)->uid;
+- seq = nlh->nlmsg_seq;
+- data = NLMSG_DATA(nlh);
+-
+- ietd_pid = pid;
+-
+- return 0;
+-}
+-
+ static void event_recv_skb(struct sk_buff *skb)
+ {
+- int err;
+ struct nlmsghdr *nlh;
+ u32 rlen;
+
+@@ -42,9 +26,9 @@
+ rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+ if (rlen > skb->len)
+ rlen = skb->len;
+- if ((err = event_recv_msg(skb, nlh))) {
+- netlink_ack(skb, nlh, -err);
+- } else if (nlh->nlmsg_flags & NLM_F_ACK)
++ ietd_pid = NETLINK_CB(skb).pid;
++ WARN_ON(ietd_pid == 0);
++ if (nlh->nlmsg_flags & NLM_F_ACK)
+ netlink_ack(skb, nlh, 0);
+ skb_pull(skb, rlen);
+ }
+@@ -59,6 +43,7 @@
+ if (!(skb = alloc_skb(NLMSG_SPACE(len), gfp_mask)))
+ return -ENOMEM;
+
++ WARN_ON(ietd_pid == 0);
+ nlh = __nlmsg_put(skb, ietd_pid, seq++, NLMSG_DONE, len - sizeof(*nlh), 0);
+
+ memcpy(NLMSG_DATA(nlh), data, len);
diff --git a/debian/patches/series b/debian/patches/series
index f267d0c..8f7e56c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ iscsitarget-prelim-1.4.20.3.patch
0001-Makefile-changes-to-support-3.x-kernels.patch
0002-Fix-send_data_rsp-to-handle-sense-data-correctly.patch
0003-Compile-fix-for-kernels-3.1-and-3.2.patch
+inactive-sessions.patch
687925.patch.sig
Description: PGP signature
<>
Bug#687925: diff for NMU version 1.4.20.2-10.1
On 09/17/2012 03:49 PM, Ritesh Raj Sarraf wrote: > On Monday 17 September 2012 03:09 PM, Loic Dachary wrote: >> Dear maintainer, >> >> I've prepared an NMU for iscsitarget (versioned as 1.4.20.2-10.1) and >> uploaded it to DELAYED/3. Please feel free to tell me if I should delay it >> longer. >> >> I'll take care of the unblock request. > Can you rebase it against the version in experimental? > > Given the freeze, I am not hopeful of it getting in for Wheezy. But > we'll see. > So can you, instead, rebase your work against the one in experimental > and send a patch? > Hi, I will do as you ask. I would like to be extra sure that I understand how you would like to proceed, please correct me if I'm wrong: a) merge the patch fixing #687925 into http://packages.qa.debian.org/i/iscsitarget/news/20120915T091748Z.html b) submit the -11 which already includes: * [6dfdd7c] Add iscsitarget-dkms to Recommends and drop iscsitarget-module * [281b4a4] Update README.Debian explaining the new DKMS package. Thanks to Olaf van der Spek (Closes: #668382) * [a0d484c] Drop patch fix-build-3-2.patch * [afdf1df] Add patches from 1.4.20 stable branch (Closes: #685422) c) ask for an unblock and advocate for each of the 5 changes d) if some of the changes are rejected, repackage -11 to contain only those that are acceptable e) submit the -11 again f) re post the unblock request which will get accepted because they were agreed during c) The proposed NMU was based on the assumption that it would be easier to fix the release critical bug first and then advocate for other changes: a) ask for an unblock of -10.1 fixing solely RC#687925 b) discuss -11 while -10.1 migrates to testing proceed as in b) to f) above. I am concerned that including the publication of the resolution of RC#687925 ( which blocks the installation of the nova-volume package which is essential to the successfull deployment of the entire OpenStack solution ) into a larger discussion will involve a significant delay, maybe weeks, while the other changes are debated. Thanks a lot for your work with the iscsitarget package : I use it daily :-) <> signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
On 17/09/2012 15:49, Ritesh Raj Sarraf wrote: Given the freeze, I am not hopeful of it getting in for Wheezy. Doesn't look so awful to not be unblocked. Why do you think the contrary? (It still needs to be acked by -boot folks though) -- Mehdi Dogguy -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#687925: diff for NMU version 1.4.20.2-10.1
On Monday 17 September 2012 03:09 PM, Loic Dachary wrote: > Dear maintainer, > > I've prepared an NMU for iscsitarget (versioned as 1.4.20.2-10.1) and > uploaded it to DELAYED/3. Please feel free to tell me if I should delay it > longer. > > I'll take care of the unblock request. Can you rebase it against the version in experimental? Given the freeze, I am not hopeful of it getting in for Wheezy. But we'll see. So can you, instead, rebase your work against the one in experimental and send a patch? -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System signature.asc Description: OpenPGP digital signature
Bug#687925: diff for NMU version 1.4.20.2-10.1
tags 687925 + patch
tags 687925 + pending
Dear maintainer,
I've prepared an NMU for iscsitarget (versioned as 1.4.20.2-10.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I should delay it
longer.
I'll take care of the unblock request.
Regards.
diff -Nru iscsitarget-1.4.20.2/debian/changelog iscsitarget-1.4.20.2/debian/changelog
--- iscsitarget-1.4.20.2/debian/changelog 2012-03-13 20:36:56.0 +0100
+++ iscsitarget-1.4.20.2/debian/changelog 2012-09-17 10:42:29.0 +0200
@@ -1,3 +1,11 @@
+iscsitarget (1.4.20.2-10.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ * Fixes ietadm not detecting inactive sessions (Closes: #687925).
+
+ -- Loic Dachary (OuoU) Mon, 17 Sep 2012 10:42:29 +0200
+
iscsitarget (1.4.20.2-10) unstable; urgency=low
* [2bebbc2] don't prompt on modified conffiles.
diff -Nru iscsitarget-1.4.20.2/debian/patches/inactive-sessions.patch iscsitarget-1.4.20.2/debian/patches/inactive-sessions.patch
--- iscsitarget-1.4.20.2/debian/patches/inactive-sessions.patch 1970-01-01 01:00:00.0 +0100
+++ iscsitarget-1.4.20.2/debian/patches/inactive-sessions.patch 2012-09-17 10:29:12.0 +0200
@@ -0,0 +1,83 @@
+Description: ietadm not detecting inactive sessions
+ Once 1.4.20.3 is released, this patch can be dropped, it is commited at
+ http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision
+ .
+ Fix retrieval of ietd pid from netlink
+ .
+ The ietd pid was retrieved from the credentials in the netlink skb
+ which happened to work with kernels < 3.2. These days the credentials
+ are not sent by default anymore (and ietd doesn't fill them in) so
+ the pid needs to be determined from the netlink_skb_parms.
+ .
+ This fixes a bug reported by Clay Gerrard ("Can't delete target after
+ initiator logs out", caused by the session removal event not making it
+ to ietd).
+ .
+Author: Arne Redlich
+Reviewed-by: Loic Dachary
+Last-Update: 2012-09-17
+Applied-Upstream: http://iscsitarget.svn.sourceforge.net/viewvc/iscsitarget?revision=478&view=revision
+Bug-Debian: http://bugs.debian.org/687925
+Bug-Ubuntu: https://launchpad.net/bugs/967984
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: ,
+Bug:
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded:
+Reviewed-By:
+Last-Update:
+
+--- trunk/kernel/event.c 2012/04/03 18:19:28 477
trunk/kernel/event.c 2012/04/06 21:58:31 478
+@@ -14,24 +14,8 @@
+ static struct sock *nl;
+ static u32 ietd_pid;
+
+-static int event_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+-{
+- u32 uid, pid, seq;
+- char *data;
+-
+- pid = NETLINK_CREDS(skb)->pid;
+- uid = NETLINK_CREDS(skb)->uid;
+- seq = nlh->nlmsg_seq;
+- data = NLMSG_DATA(nlh);
+-
+- ietd_pid = pid;
+-
+- return 0;
+-}
+-
+ static void event_recv_skb(struct sk_buff *skb)
+ {
+- int err;
+ struct nlmsghdr *nlh;
+ u32 rlen;
+
+@@ -42,9 +26,9 @@
+ rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+ if (rlen > skb->len)
+ rlen = skb->len;
+- if ((err = event_recv_msg(skb, nlh))) {
+- netlink_ack(skb, nlh, -err);
+- } else if (nlh->nlmsg_flags & NLM_F_ACK)
++ ietd_pid = NETLINK_CB(skb).pid;
++ WARN_ON(ietd_pid == 0);
++ if (nlh->nlmsg_flags & NLM_F_ACK)
+ netlink_ack(skb, nlh, 0);
+ skb_pull(skb, rlen);
+ }
+@@ -59,6 +43,7 @@
+ if (!(skb = alloc_skb(NLMSG_SPACE(len), gfp_mask)))
+ return -ENOMEM;
+
++ WARN_ON(ietd_pid == 0);
+ nlh = __nlmsg_put(skb, ietd_pid, seq++, NLMSG_DONE, len - sizeof(*nlh), 0);
+
+ memcpy(NLMSG_DATA(nlh), data, len);
diff -Nru iscsitarget-1.4.20.2/debian/patches/series iscsitarget-1.4.20.2/debian/patches/series
--- iscsitarget-1.4.20.2/debian/patches/series 2012-03-13 20:36:56.0 +0100
+++ iscsitarget-1.4.20.2/debian/patches/series 2012-09-17 10:13:01.0 +0200
@@ -1,2 +1,3 @@
fix-build-3-2.patch
iscsitarget-prelim-1.4.20.3.patch
+inactive-sessions.patch
<>
signature.asc
Description: OpenPGP digital signature
