]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: zram: round up the disk size provided by user
authorJerome Marchand <jmarchan@redhat.com>
Fri, 17 Dec 2010 16:02:28 +0000 (17:02 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 Jan 2011 00:06:18 +0000 (16:06 -0800)
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>
drivers/staging/zram/zram_sysfs.c

index ad62db221b6fd789d05648e200fa53209193d71f..a70cc010d18da4d3eb0b620826595f394301dc01 100644 (file)
@@ -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;