Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / staging / zram / zram_sysfs.c

diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
index 0ea8ed296a9db6e0b70719daa778cd8292b64d4a..a7f377175525b683d511d51f91173dd2079217f4 100644 (file)
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
@@ -34,7 +34,7 @@ static struct zram *dev_to_zram(struct device *dev)
        int i;
        struct zram *zram = NULL;
 
-       for (i = 0; i < zram_num_devices; i++) {
+       for (i = 0; i < zram_get_num_devices(); i++) {
                zram = &zram_devices[i];
                if (disk_to_dev(zram->disk) == dev)
                        break;
@@ -58,7 +58,7 @@ static ssize_t disksize_store(struct device *dev,
        u64 disksize;
        struct zram *zram = dev_to_zram(dev);
 
-       ret = strict_strtoull(buf, 10, &disksize);
+       ret = kstrtoull(buf, 10, &disksize);
        if (ret)
                return ret;
 
@@ -88,7 +88,7 @@ static ssize_t reset_store(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t len)
 {
        int ret;
-       unsigned long do_reset;
+       unsigned short do_reset;
        struct zram *zram;
        struct block_device *bdev;
 
@@ -99,7 +99,7 @@ static ssize_t reset_store(struct device *dev,
        if (bdev->bd_holders)
                return -EBUSY;
 
-       ret = strict_strtoul(buf, 10, &do_reset);
+       ret = kstrtou16(buf, 10, &do_reset);
        if (ret)
                return ret;
 
@@ -187,7 +187,7 @@ static ssize_t mem_used_total_show(struct device *dev,
        struct zram *zram = dev_to_zram(dev);
 
        if (zram->init_done) {
-               val = xv_get_total_size_bytes(zram->mem_pool) +
+               val = zs_get_total_size_bytes(zram->mem_pool) +
                        ((u64)(zram->stats.pages_expand) << PAGE_SHIFT);
        }