Hi Hermann, On Wed, Apr 22, 2015 at 10:26:20AM +0200, Hermann Lauer wrote: > Hello All, > > On Mon, Apr 20, 2015 at 08:59:27AM +0200, Markus Pargmann wrote: > > At the moment the nbd timeout just detects hanging tcp operations. This > > is not enough to detect a hanging or bad connection as expected of a > > timeout. > > many thanks for the patch, which I tried on the jessie 3.16.7-ckt9 kernel > and vanilla 4.0: > > linux-4.0> patch -p1 --dry-run <../patches/nbd-timeout.patch > patching file drivers/block/nbd.c > Hunk #1 FAILED at 59. > Hunk #2 succeeded at 133 (offset 12 lines). > Hunk #3 succeeded at 141 (offset 12 lines). > Hunk #4 succeeded at 196 (offset 12 lines). > Hunk #5 succeeded at 214 (offset 12 lines). > Hunk #6 FAILED at 399. > Hunk #7 succeeded at 499 (offset 21 lines). > Hunk #8 succeeded at 528 (offset 21 lines). > Hunk #9 succeeded at 537 (offset 21 lines). > Hunk #10 succeeded at 562 (offset 21 lines). > Hunk #11 succeeded at 686 (offset 21 lines). > Hunk #12 succeeded at 891 (offset 26 lines). > 2 out of 12 hunks FAILED -- saving rejects to file drivers/block/nbd.c.rej > > The same hunks fail on both trees, so my guess is that the patch is against > kernel/git/next/linux-next.git. Should have mentioned that the patch is based on git tag nbd-for-4.1 git://git.pengutronix.de/git/mpa/linux-nbd.git . I also just pushed v4.0/topic/nbd/timeout so you can directly test that. If it is easier for you, I could rebase the patch onto v4.0. The cleanups in nbd-for-4.1 are not important for this patch. Best Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: Digital signature