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
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
staging
/
zram
/
zram_drv.c
diff --git
a/drivers/staging/zram/zram_drv.c
b/drivers/staging/zram/zram_drv.c
index
8c3c057
..
5415712
100644
(file)
--- a/
drivers/staging/zram/zram_drv.c
+++ b/
drivers/staging/zram/zram_drv.c
@@
-435,12
+435,6
@@
static int zram_make_request(struct request_queue *queue, struct bio *bio)
int ret = 0;
struct zram *zram = queue->queuedata;
int ret = 0;
struct zram *zram = queue->queuedata;
- if (unlikely(!zram->init_done)) {
- set_bit(BIO_UPTODATE, &bio->bi_flags);
- bio_endio(bio, 0);
- return 0;
- }
-
if (!valid_io_request(zram, bio)) {
zram_stat64_inc(zram, &zram->stats.invalid_io);
bio_io_error(bio);
if (!valid_io_request(zram, bio)) {
zram_stat64_inc(zram, &zram->stats.invalid_io);
bio_io_error(bio);
@@
-533,7
+527,7
@@
int zram_init_device(struct zram *zram)
}
num_pages = zram->disksize >> PAGE_SHIFT;
}
num_pages = zram->disksize >> PAGE_SHIFT;
- zram->table = v
m
alloc(num_pages * sizeof(*zram->table));
+ zram->table = v
z
alloc(num_pages * sizeof(*zram->table));
if (!zram->table) {
pr_err("Error allocating zram address table\n");
/* To prevent accessing table entries during cleanup */
if (!zram->table) {
pr_err("Error allocating zram address table\n");
/* To prevent accessing table entries during cleanup */
@@
-541,7
+535,6
@@
int zram_init_device(struct zram *zram)
ret = -ENOMEM;
goto fail;
}
ret = -ENOMEM;
goto fail;
}
- memset(zram->table, 0, num_pages * sizeof(*zram->table));
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);