[Cluster-devel] cluster/gnbd-kernel/src gnbd.c

[bmarzins@sourceware.org <bmarzins@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	bmarzins at sourceware.org	2007-01-05 23:01:58

Modified files:
	gnbd-kernel/src: gnbd.c 

Log message:
	Get GNBD compiling with the latest upstream kernel.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/gnbd.c.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- cluster/gnbd-kernel/src/gnbd.c	2006/12/18 18:18:22	1.17
+++ cluster/gnbd-kernel/src/gnbd.c	2007/01/05 23:01:58	1.18
@@ -574,12 +574,12 @@
 		struct gnbd_device *dev;
 
 		blkdev_dequeue_request(req);
-		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%lx)\n",
-				req->rq_disk->disk_name, req, req->flags);
+		dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n",
+				req->rq_disk->disk_name, req, req->cmd_type);
 
-		if (!(req->flags & REQ_CMD))
+		if (!blk_fs_request(req))
 			goto error_out;
-		
+
 		dev = req->rq_disk->private_data;
 
 		if (dev->receiver_pid == -1)
@@ -885,12 +885,12 @@
 		printk(KERN_CRIT "gnbd: sizeof gnbd_request needs to be 28 in order to work!\n" );
 		return -EIO;
 	}
-	shutdown_req.flags = REQ_SPECIAL;
+	shutdown_req.cmd_type = REQ_TYPE_SPECIAL;
 	gnbd_cmd(&shutdown_req) = GNBD_CMD_DISC;
 	shutdown_req.sector = 0;
 	shutdown_req.nr_sectors = 0;
 
-	ping_req.flags = REQ_SPECIAL;
+	ping_req.cmd_type = REQ_TYPE_SPECIAL;
 	gnbd_cmd(&ping_req) = GNBD_CMD_PING;
 	ping_req.sector = 0;
 	ping_req.nr_sectors = 0;