Commit be257c61 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds

zram: do not pass rw argument to __zram_make_request()

Do not pass rw argument down the __zram_make_request() -> zram_bvec_rw()
chain, decode it in zram_bvec_rw() instead.  Besides, this is the place
where we distinguish READ and WRITE bio data directions, so account zram
RW stats here, instead of __zram_make_request().  This also allows to
account a real number of zram READ/WRITE operations, not just requests
(single RW request may cause a number of zram RW ops with separate
locking, compression/decompression, etc).
Signed-off-by: default avatarSergey Senozhatsky <>
Acked-by: default avatarMinchan Kim <>
Acked-by: default avatarJerome Marchand <>
Cc: Nitin Gupta <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent be2d1d56
......@@ -533,14 +533,18 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
int offset, struct bio *bio, int rw)
int offset, struct bio *bio)
int ret;
int rw = bio_data_dir(bio);
if (rw == READ)
if (rw == READ) {
ret = zram_bvec_read(zram, bvec, index, offset, bio);
} else {
ret = zram_bvec_write(zram, bvec, index, offset);
return ret;
......@@ -672,22 +676,13 @@ static ssize_t reset_store(struct device *dev,
return ret;
static void __zram_make_request(struct zram *zram, struct bio *bio, int rw)
static void __zram_make_request(struct zram *zram, struct bio *bio)
int offset;
u32 index;
struct bio_vec bvec;
struct bvec_iter iter;
switch (rw) {
case READ:
case WRITE:
index = bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT;
offset = (bio->bi_iter.bi_sector &
......@@ -706,16 +701,15 @@ static void __zram_make_request(struct zram *zram, struct bio *bio, int rw)
bv.bv_len = max_transfer_size;
bv.bv_offset = bvec.bv_offset;
if (zram_bvec_rw(zram, &bv, index, offset, bio, rw) < 0)
if (zram_bvec_rw(zram, &bv, index, offset, bio) < 0)
goto out;
bv.bv_len = bvec.bv_len - max_transfer_size;
bv.bv_offset += max_transfer_size;
if (zram_bvec_rw(zram, &bv, index+1, 0, bio, rw) < 0)
if (zram_bvec_rw(zram, &bv, index + 1, 0, bio) < 0)
goto out;
} else
if (zram_bvec_rw(zram, &bvec, index, offset, bio, rw)
< 0)
if (zram_bvec_rw(zram, &bvec, index, offset, bio) < 0)
goto out;
update_position(&index, &offset, &bvec);
......@@ -745,7 +739,7 @@ static void zram_make_request(struct request_queue *queue, struct bio *bio)
goto error;
__zram_make_request(zram, bio, bio_data_dir(bio));
__zram_make_request(zram, bio);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment