patch-2.4.0-test10 linux/drivers/block/nbd.c

Next file: linux/drivers/block/paride/Makefile
Previous file: linux/drivers/block/loop.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/block/nbd.c linux/drivers/block/nbd.c
@@ -55,7 +55,7 @@
 static u64 nbd_bytesizes[MAX_NBD];
 
 static struct nbd_device nbd_dev[MAX_NBD];
-static devfs_handle_t devfs_handle = NULL;
+static devfs_handle_t devfs_handle;
 
 #define DEBUG( s )
 /* #define DEBUG( s ) printk( s ) 
@@ -106,7 +106,7 @@
 
 
 	do {
-		sock->sk->allocation = GFP_ATOMIC;
+		sock->sk->allocation = GFP_BUFFER;
 		iov.iov_base = buf;
 		iov.iov_len = size;
 		msg.msg_name = NULL;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)