Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235615
b: refs/heads/master
c: f2da987
h: refs/heads/master
i:
  235613: ffba2f5
  235611: 65e479b
  235607: bf282f7
  235599: 34b4c54
  235583: b467d67
v: v3
  • Loading branch information
Jerome Marchand authored and Greg Kroah-Hartman committed Jan 21, 2011
1 parent 930c428 commit 79fe132
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 2b152873469d2b0751e8b726df6415f05e37632e
refs/heads/master: f2da98739da4e20e907f8317d513868764002d31
3 changes: 2 additions & 1 deletion trunk/drivers/staging/zram/zram_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <linux/device.h>
#include <linux/genhd.h>
#include <linux/mm.h>

#include "zram_drv.h"

Expand Down Expand Up @@ -65,7 +66,7 @@ static ssize_t disksize_store(struct device *dev,
if (ret)
return ret;

zram->disksize &= PAGE_MASK;
zram->disksize = PAGE_ALIGN(zram->disksize);
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);

return len;
Expand Down

0 comments on commit 79fe132

Please sign in to comment.