zram: move bd_stat to writeback section

Move bd_stat function and attribute declaration to
existing CONFIG_WRITEBACK ifdef-sections.

Link: https://lkml.kernel.org/r/20251201094754.4149975-5-senozhatsky@chromium.org
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Brian Geffon <bgeffon@google.com>
Cc: David Stevens <stevensd@google.com>
Cc: Minchan Kim <minchan@google.com>
Cc: Richard Chang <richardycc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 3cc03c3f7389f9a76e7904704961f78392bfed35..1a0f550219b11f28c123bc6ee22d381f3cd8143a 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -539,6 +539,24 @@ struct zram_rb_req {
        u32 index;
 };
 
+#define FOUR_K(x) ((x) * (1 << (PAGE_SHIFT - 12)))
+static ssize_t bd_stat_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
+{
+       struct zram *zram = dev_to_zram(dev);
+       ssize_t ret;
+
+       down_read(&zram->init_lock);
+       ret = sysfs_emit(buf,
+                        "%8llu %8llu %8llu\n",
+                        FOUR_K((u64)atomic64_read(&zram->stats.bd_count)),
+                        FOUR_K((u64)atomic64_read(&zram->stats.bd_reads)),
+                        FOUR_K((u64)atomic64_read(&zram->stats.bd_writes)));
+       up_read(&zram->init_lock);
+
+       return ret;
+}
+
 static ssize_t writeback_compressed_store(struct device *dev,
                                          struct device_attribute *attr,
                                          const char *buf, size_t len)
@@ -1976,28 +1994,8 @@ static ssize_t mm_stat_show(struct device *dev,
        return ret;
 }
 
-#ifdef CONFIG_ZRAM_WRITEBACK
-#define FOUR_K(x) ((x) * (1 << (PAGE_SHIFT - 12)))
-static ssize_t bd_stat_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
-{
-       struct zram *zram = dev_to_zram(dev);
-       ssize_t ret;
-
-       down_read(&zram->init_lock);
-       ret = sysfs_emit(buf,
-                       "%8llu %8llu %8llu\n",
-                       FOUR_K((u64)atomic64_read(&zram->stats.bd_count)),
-                       FOUR_K((u64)atomic64_read(&zram->stats.bd_reads)),
-                       FOUR_K((u64)atomic64_read(&zram->stats.bd_writes)));
-       up_read(&zram->init_lock);
-
-       return ret;
-}
-#endif
-
 static ssize_t debug_stat_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
+                              struct device_attribute *attr, char *buf)
 {
        int version = 1;
        struct zram *zram = dev_to_zram(dev);
@@ -2015,9 +2013,6 @@ static ssize_t debug_stat_show(struct device *dev,
 
 static DEVICE_ATTR_RO(io_stat);
 static DEVICE_ATTR_RO(mm_stat);
-#ifdef CONFIG_ZRAM_WRITEBACK
-static DEVICE_ATTR_RO(bd_stat);
-#endif
 static DEVICE_ATTR_RO(debug_stat);
 
 static void zram_meta_free(struct zram *zram, u64 disksize)
@@ -3079,6 +3074,7 @@ static DEVICE_ATTR_WO(mem_used_max);
 static DEVICE_ATTR_WO(idle);
 static DEVICE_ATTR_RW(comp_algorithm);
 #ifdef CONFIG_ZRAM_WRITEBACK
+static DEVICE_ATTR_RO(bd_stat);
 static DEVICE_ATTR_RW(backing_dev);
 static DEVICE_ATTR_WO(writeback);
 static DEVICE_ATTR_RW(writeback_limit);
@@ -3102,6 +3098,7 @@ static struct attribute *zram_disk_attrs[] = {
        &dev_attr_idle.attr,
        &dev_attr_comp_algorithm.attr,
 #ifdef CONFIG_ZRAM_WRITEBACK
+       &dev_attr_bd_stat.attr,
        &dev_attr_backing_dev.attr,
        &dev_attr_writeback.attr,
        &dev_attr_writeback_limit.attr,
@@ -3111,9 +3108,6 @@ static struct attribute *zram_disk_attrs[] = {
 #endif
        &dev_attr_io_stat.attr,
        &dev_attr_mm_stat.attr,
-#ifdef CONFIG_ZRAM_WRITEBACK
-       &dev_attr_bd_stat.attr,
-#endif
        &dev_attr_debug_stat.attr,
 #ifdef CONFIG_ZRAM_MULTI_COMP
        &dev_attr_recomp_algorithm.attr,