git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
s390
/
block
/
dasd_eckd.c
diff --git
a/drivers/s390/block/dasd_eckd.c
b/drivers/s390/block/dasd_eckd.c
index
b7a7fac
..
fdaa471
100644
(file)
--- a/
drivers/s390/block/dasd_eckd.c
+++ b/
drivers/s390/block/dasd_eckd.c
@@
-1215,7
+1215,7
@@
dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
dst = page_address(bv->bv_page) + bv->bv_offset;
if (dasd_page_cache) {
char *copy = kmem_cache_alloc(dasd_page_cache,
dst = page_address(bv->bv_page) + bv->bv_offset;
if (dasd_page_cache) {
char *copy = kmem_cache_alloc(dasd_page_cache,
-
SLAB
_DMA | __GFP_NOWARN);
+
GFP
_DMA | __GFP_NOWARN);
if (copy && rq_data_dir(req) == WRITE)
memcpy(copy + bv->bv_offset, dst, bv->bv_len);
if (copy)
if (copy && rq_data_dir(req) == WRITE)
memcpy(copy + bv->bv_offset, dst, bv->bv_len);
if (copy)
@@
-1266,7
+1266,7
@@
dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
recid++;
}
}
recid++;
}
}
- if (req->flags & REQ_FAILFAST)
+ if (req->
cmd_
flags & REQ_FAILFAST)
set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
cqr->device = device;
cqr->expires = 5 * 60 * HZ; /* 5 minutes */
set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
cqr->device = device;
cqr->expires = 5 * 60 * HZ; /* 5 minutes */