projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'acpi-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
drivers
/
block
/
brd.c
diff --git
a/drivers/block/brd.c
b/drivers/block/brd.c
index
3439b28
..
0c76d40
100644
(file)
--- a/
drivers/block/brd.c
+++ b/
drivers/block/brd.c
@@
-300,20
+300,20
@@
static void copy_from_brd(void *dst, struct brd_device *brd,
* Process a single bvec of a bio.
*/
static int brd_do_bvec(struct brd_device *brd, struct page *page,
* Process a single bvec of a bio.
*/
static int brd_do_bvec(struct brd_device *brd, struct page *page,
- unsigned int len, unsigned int off,
int op
,
+ unsigned int len, unsigned int off,
bool is_write
,
sector_t sector)
{
void *mem;
int err = 0;
sector_t sector)
{
void *mem;
int err = 0;
- if (
op_is_write(op)
) {
+ if (
is_write
) {
err = copy_to_brd_setup(brd, sector, len);
if (err)
goto out;
}
mem = kmap_atomic(page);
err = copy_to_brd_setup(brd, sector, len);
if (err)
goto out;
}
mem = kmap_atomic(page);
- if (!
op_is_write(op)
) {
+ if (!
is_write
) {
copy_from_brd(mem + off, brd, sector, len);
flush_dcache_page(page);
} else {
copy_from_brd(mem + off, brd, sector, len);
flush_dcache_page(page);
} else {
@@
-350,8
+350,8
@@
static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio)
unsigned int len = bvec.bv_len;
int err;
unsigned int len = bvec.bv_len;
int err;
- err = brd_do_bvec(brd, bvec.bv_page, len,
-
bvec.bv_offset, bio_op(bio
), sector);
+ err = brd_do_bvec(brd, bvec.bv_page, len,
bvec.bv_offset,
+
op_is_write(bio_op(bio)
), sector);
if (err)
goto io_error;
sector += len >> SECTOR_SHIFT;
if (err)
goto io_error;
sector += len >> SECTOR_SHIFT;
@@
-366,11
+366,11
@@
io_error:
}
static int brd_rw_page(struct block_device *bdev, sector_t sector,
}
static int brd_rw_page(struct block_device *bdev, sector_t sector,
- struct page *page,
int op
)
+ struct page *page,
bool is_write
)
{
struct brd_device *brd = bdev->bd_disk->private_data;
{
struct brd_device *brd = bdev->bd_disk->private_data;
- int err = brd_do_bvec(brd, page, PAGE_SIZE, 0,
op
, sector);
- page_endio(page,
op
, err);
+ int err = brd_do_bvec(brd, page, PAGE_SIZE, 0,
is_write
, sector);
+ page_endio(page,
is_write
, err);
return err;
}
return err;
}