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 d521122826f65d5893c62f740cf408c47649513b..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;
@@ -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);
        }