[PATCH 1/3] nbd: remove unused flags fields
STALE5504d
From: Paolo Bonzini <hidden>
Date: 2011-09-07 16:17:54
Also in:
lkml
Subsystem:
block layer, network block device (nbd), the rest · Maintainers:
Jens Axboe, Josef Bacik, Linus Torvalds
Revision v1 of 2 in this series.
Revisions (2)
- v1 current
- v2 [diff vs current]
The flags field is never written right now. Before putting it to new use in the next patches, clean up the uses. Cc: Paul Clements <Paul.Clements-G8/ITkJZaeZWk0Htik3J/w@public.gmane.org> Signed-off-by: Paolo Bonzini <redacted> --- drivers/block/nbd.c | 11 +++-------- include/linux/nbd.h | 4 ---- 2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index f533f33..be23aec 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c@@ -453,15 +453,10 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req) if (req->cmd_type != REQ_TYPE_FS) goto error_out; - nbd_cmd(req) = NBD_CMD_READ; - if (rq_data_dir(req) == WRITE) { + if (rq_data_dir(req) == WRITE) nbd_cmd(req) = NBD_CMD_WRITE; - if (lo->flags & NBD_READ_ONLY) { - printk(KERN_ERR "%s: Write on read-only\n", - lo->disk->disk_name); - goto error_out; - } - } + else + nbd_cmd(req) = NBD_CMD_READ; req->errors = 0;
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d146ca1..0582054 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h@@ -42,10 +42,6 @@ enum { #include <linux/wait.h> #include <linux/mutex.h> -/* values for flags field */ -#define NBD_READ_ONLY 0x0001 -#define NBD_WRITE_NOCHK 0x0002 - struct request; struct nbd_device {
--
1.7.6