aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/zram
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2010-12-17 17:02:28 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-20 16:06:18 -0800
commitf2da98739da4e20e907f8317d513868764002d31 (patch)
tree6e97815e0c29215c03eafbade38698ef5df61869 /drivers/staging/zram
parent2b152873469d2b0751e8b726df6415f05e37632e (diff)
Staging: zram: round up the disk size provided by user
Currently disksize_store() round down the disk size provided by user. This is probably not what one would expect, so round up instead. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/zram')
-rw-r--r--drivers/staging/zram/zram_sysfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
index ad62db221b6..a70cc010d18 100644
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
@@ -14,6 +14,7 @@
#include <linux/device.h>
#include <linux/genhd.h>
+#include <linux/mm.h>
#include "zram_drv.h"
@@ -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;