git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
block
/
blk-map.c
diff --git
a/block/blk-map.c
b/block/blk-map.c
index 9083cf0180cc8a296d2529a4ef9d9943ea5d05c1..c65d7593f7f1deba5511347ceeb6dd5c881e5b3c 100644
(file)
--- a/
block/blk-map.c
+++ b/
block/blk-map.c
@@
-307,7
+307,7
@@
int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
return PTR_ERR(bio);
if (rq_data_dir(rq) == WRITE)
- bio->bi_rw |= (1 <<
BIO_RW
);
+ bio->bi_rw |= (1 <<
REQ_WRITE
);
if (do_copy)
rq->cmd_flags |= REQ_COPY_USER;