diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/s390/block/dasd.c | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
| download | op-kernel-dev-c324b44c34050cf2a9b58830e11c974806bd85d8.zip op-kernel-dev-c324b44c34050cf2a9b58830e11c974806bd85d8.tar.gz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/s390/block/dasd.c')
| -rw-r--r-- | drivers/s390/block/dasd.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index d5f5398..8fc891a 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -7,7 +7,7 @@ * Bugreports.to..: <Linux390@de.ibm.com> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 * - * $Revision: 1.165 $ + * $Revision: 1.167 $ */ #include <linux/config.h> @@ -1131,17 +1131,13 @@ __dasd_process_blk_queue(struct dasd_device * device) request_queue_t *queue; struct request *req; struct dasd_ccw_req *cqr; - int nr_queued, feature_ro; + int nr_queued; queue = device->request_queue; /* No queue ? Then there is nothing to do. */ if (queue == NULL) return; - feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY); - if (feature_ro < 0) /* no devmap */ - return; - /* * We requeue request from the block device queue to the ccw * queue only in two states. In state DASD_STATE_READY the @@ -1162,7 +1158,8 @@ __dasd_process_blk_queue(struct dasd_device * device) nr_queued < DASD_CHANQ_MAX_SIZE) { req = elv_next_request(queue); - if (feature_ro && rq_data_dir(req) == WRITE) { + if (device->features & DASD_FEATURE_READONLY && + rq_data_dir(req) == WRITE) { DBF_DEV_EVENT(DBF_ERR, device, "Rejecting write request %p", req); @@ -1814,17 +1811,13 @@ dasd_generic_set_online (struct ccw_device *cdev, { struct dasd_device *device; - int feature_diag, rc; + int rc; device = dasd_create_device(cdev); if (IS_ERR(device)) return PTR_ERR(device); - feature_diag = dasd_get_feature(cdev, DASD_FEATURE_USEDIAG); - if (feature_diag < 0) - return feature_diag; - - if (feature_diag) { + if (device->features & DASD_FEATURE_USEDIAG) { if (!dasd_diag_discipline_pointer) { printk (KERN_WARNING "dasd_generic couldn't online device %s " |
