git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ext4: inline ext4_writepage() into mpage_da_submit_io()
[pandora-kernel.git]
/
fs
/
bio.c
diff --git
a/fs/bio.c
b/fs/bio.c
index
e7bf6ca
..
8abb2df
100644
(file)
--- a/
fs/bio.c
+++ b/
fs/bio.c
@@
-843,7
+843,8
@@
struct bio *bio_copy_user_iov(struct request_queue *q,
if (!bio)
goto out_bmd;
if (!bio)
goto out_bmd;
- bio->bi_rw |= (!write_to_vm << BIO_RW);
+ if (!write_to_vm)
+ bio->bi_rw |= REQ_WRITE;
ret = 0;
ret = 0;
@@
-1024,7
+1025,7
@@
static struct bio *__bio_map_user_iov(struct request_queue *q,
* set data direction, and check if mapped pages need bouncing
*/
if (!write_to_vm)
* set data direction, and check if mapped pages need bouncing
*/
if (!write_to_vm)
- bio->bi_rw |=
(1 << BIO_RW)
;
+ bio->bi_rw |=
REQ_WRITE
;
bio->bi_bdev = bdev;
bio->bi_flags |= (1 << BIO_USER_MAPPED);
bio->bi_bdev = bdev;
bio->bi_flags |= (1 << BIO_USER_MAPPED);