[PATCH] Split struct request ->flags into two parts

Right now ->flags is a bit of a mess: some are request types, and
others are just modifiers. Clean this up by splitting it into
->cmd_type and ->cmd_flags. This allows introduction of generic
Linux block message types, useful for sending generic Linux commands
to block devices.

Signed-off-by: Jens Axboe <axboe@suse.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index bdbade9a5cf5..9d1035e8d9d8 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -407,10 +407,10 @@ static void do_nbd_request(request_queue_t * q)
                 struct nbd_device *lo;
 
                 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;
 
                 lo = req->rq_disk->private_data;
@@ -489,7 +489,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case NBD_DISCONNECT:
                 printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name);
-                sreq.flags = REQ_SPECIAL;
+                sreq.cmd_type = REQ_TYPE_SPECIAL;
                 nbd_cmd(&sreq) = NBD_CMD_DISC;
                 /*
                  * Set these to sane values in case server implementation