Staging: zram: simplify zram_make_request
zram_read() and zram_write() always return zero, so make them return void to simplify the code. Signed-off-by: Nitin Gupta <ngupta@vflare.org> Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
dc7b202a4e
Коммит
7d7854b4da
|
@ -200,7 +200,7 @@ static void handle_uncompressed_page(struct zram *zram,
|
||||||
flush_dcache_page(page);
|
flush_dcache_page(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int zram_read(struct zram *zram, struct bio *bio)
|
static void zram_read(struct zram *zram, struct bio *bio)
|
||||||
{
|
{
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
@ -209,7 +209,7 @@ static int zram_read(struct zram *zram, struct bio *bio)
|
||||||
|
|
||||||
if (unlikely(!zram->init_done)) {
|
if (unlikely(!zram->init_done)) {
|
||||||
bio_endio(bio, -ENXIO);
|
bio_endio(bio, -ENXIO);
|
||||||
return 0;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
zram_stat64_inc(zram, &zram->stats.num_reads);
|
zram_stat64_inc(zram, &zram->stats.num_reads);
|
||||||
|
@ -271,14 +271,13 @@ static int zram_read(struct zram *zram, struct bio *bio)
|
||||||
|
|
||||||
set_bit(BIO_UPTODATE, &bio->bi_flags);
|
set_bit(BIO_UPTODATE, &bio->bi_flags);
|
||||||
bio_endio(bio, 0);
|
bio_endio(bio, 0);
|
||||||
return 0;
|
return;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
bio_io_error(bio);
|
bio_io_error(bio);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int zram_write(struct zram *zram, struct bio *bio)
|
static void zram_write(struct zram *zram, struct bio *bio)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, ret;
|
||||||
u32 index;
|
u32 index;
|
||||||
|
@ -402,11 +401,10 @@ memstore:
|
||||||
|
|
||||||
set_bit(BIO_UPTODATE, &bio->bi_flags);
|
set_bit(BIO_UPTODATE, &bio->bi_flags);
|
||||||
bio_endio(bio, 0);
|
bio_endio(bio, 0);
|
||||||
return 0;
|
return;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
bio_io_error(bio);
|
bio_io_error(bio);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -431,7 +429,6 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio)
|
||||||
*/
|
*/
|
||||||
static int zram_make_request(struct request_queue *queue, struct bio *bio)
|
static int zram_make_request(struct request_queue *queue, struct bio *bio)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
|
||||||
struct zram *zram = queue->queuedata;
|
struct zram *zram = queue->queuedata;
|
||||||
|
|
||||||
if (!valid_io_request(zram, bio)) {
|
if (!valid_io_request(zram, bio)) {
|
||||||
|
@ -442,15 +439,15 @@ static int zram_make_request(struct request_queue *queue, struct bio *bio)
|
||||||
|
|
||||||
switch (bio_data_dir(bio)) {
|
switch (bio_data_dir(bio)) {
|
||||||
case READ:
|
case READ:
|
||||||
ret = zram_read(zram, bio);
|
zram_read(zram, bio);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WRITE:
|
case WRITE:
|
||||||
ret = zram_write(zram, bio);
|
zram_write(zram, bio);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void zram_reset_device(struct zram *zram)
|
void zram_reset_device(struct zram *zram)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче