From 475ac7bbdc9e09a9a1b2c40ac02542dd581d691d Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sun, 25 Jun 2006 05:47:42 -0700 Subject: [PATCH] --- yaml --- r: 29698 b: refs/heads/master c: dbf492d6c1a1bf5a8bda40274f479119f4c42ca4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/nbd.c | 34 ++-------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/[refs] b/[refs] index 61e82c2840d6..e1c31bffa537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83cc5ed3c4c65fc4c3729a5cec2111ede1ebf85e +refs/heads/master: dbf492d6c1a1bf5a8bda40274f479119f4c42ca4 diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index 8bca4905d7f7..7f554f2ed079 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/drivers/block/nbd.c @@ -7,39 +7,9 @@ * Copyright 1997-2000 Pavel Machek * Parts copyright 2001 Steven Whitehouse * - * (part of code stolen from loop.c) + * This file is released under GPLv2 or later. * - * 97-3-25 compiled 0-th version, not yet tested it - * (it did not work, BTW) (later that day) HEY! it works! - * (bit later) hmm, not that much... 2:00am next day: - * yes, it works, but it gives something like 50kB/sec - * 97-4-01 complete rewrite to make it possible for many requests at - * once to be processed - * 97-4-11 Making protocol independent of endianity etc. - * 97-9-13 Cosmetic changes - * 98-5-13 Attempt to make 64-bit-clean on 64-bit machines - * 99-1-11 Attempt to make 64-bit-clean on 32-bit machines - * 01-2-27 Fix to store proper blockcount for kernel (calculated using - * BLOCK_SIZE_BITS, not device blocksize) - * 01-3-11 Make nbd work with new Linux block layer code. It now supports - * plugging like all the other block devices. Also added in MSG_MORE to - * reduce number of partial TCP segments sent. - * 01-12-6 Fix deadlock condition by making queue locks independent of - * the transmit lock. - * 02-10-11 Allow hung xmit to be aborted via SIGKILL & various fixes. - * - * 03-06-22 Make nbd work with new linux 2.5 block layer design. This fixes - * memory corruption from module removal and possible memory corruption - * from sending/receiving disk data. - * 03-06-23 Cosmetic changes. - * 03-06-23 Enhance diagnostics support. - * 03-06-24 Remove unneeded blksize_bits field from nbd_device struct. - * - * 03-06-24 Cleanup PARANOIA usage & code. - * 04-02-19 Remove PARANOIA, plus various cleanups (Paul Clements) - * possible FIXME: make set_sock / set_blksize / set_size / do_it one syscall - * why not: would need access_ok and friends, would share yet another - * structure with userland + * (part of code stolen from loop.c) */ #include