Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322688
b: refs/heads/master
c: 6d7d979
h: refs/heads/master
v: v3
  • Loading branch information
Seth Jennings authored and Greg Kroah-Hartman committed Sep 5, 2012
1 parent e3fdb54 commit 3559369
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6bd4a5d96c08dc2380f8053b1bd4f879f55cd3c9
refs/heads/master: 6d7d9798ad5c97ee4e911dd070dc12dc5ae55bd0
7 changes: 3 additions & 4 deletions trunk/drivers/staging/zcache/zcache-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1251,13 +1251,12 @@ static int zcache_pampd_get_data_and_free(char *data, size_t *bufsize, bool raw,
void *pampd, struct tmem_pool *pool,
struct tmem_oid *oid, uint32_t index)
{
int ret = 0;

BUG_ON(!is_ephemeral(pool));
zbud_decompress((struct page *)(data), pampd);
if (zbud_decompress((struct page *)(data), pampd) < 0)
return -EINVAL;
zbud_free_and_delist((struct zbud_hdr *)pampd);
atomic_dec(&zcache_curr_eph_pampd_count);
return ret;
return 0;
}

/*
Expand Down

0 comments on commit 3559369

Please sign in to comment.