Merge branch 'akpm' (patches from Andrew)

Merge second patchbomb from Andrew Morton:

 - the rest of MM

 - various misc bits

 - add ability to run /sbin/reboot at reboot time

 - printk/vsprintf changes

 - fiddle with seq_printf() return value

* akpm: (114 commits)
  parisc: remove use of seq_printf return value
  lru_cache: remove use of seq_printf return value
  tracing: remove use of seq_printf return value
  cgroup: remove use of seq_printf return value
  proc: remove use of seq_printf return value
  s390: remove use of seq_printf return value
  cris fasttimer: remove use of seq_printf return value
  cris: remove use of seq_printf return value
  openrisc: remove use of seq_printf return value
  ARM: plat-pxa: remove use of seq_printf return value
  nios2: cpuinfo: remove use of seq_printf return value
  microblaze: mb: remove use of seq_printf return value
  ipc: remove use of seq_printf return value
  rtc: remove use of seq_printf return value
  power: wakeup: remove use of seq_printf return value
  x86: mtrr: if: remove use of seq_printf return value
  linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
  MAINTAINERS: CREDITS: remove Stefano Brivio from B43
  .mailmap: add Ricardo Ribalda
  CREDITS: add Ricardo Ribalda Delgado
  ...

3 files changed, 76 insertions, 2 deletions

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 2ce3dfd7e6b9..876d0c3eaf58 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -137,7 +137,7 @@
 
 */
 
-static bool verbose = 0;
+static int verbose;
 static int major = PG_MAJOR;
 static char *name = PG_NAME;
 static int disable = 0;
@@ -168,7 +168,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 
 #include <asm/uaccess.h>
 
-module_param(verbose, bool, 0644);
+module_param(verbose, int, 0644);
 module_param(major, int, 0);
 module_param(name, charp, 0);
 module_param_array(drive0, int, NULL, 0);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 871bd3550cb0..c94386aa563d 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -43,11 +43,22 @@ static const char *default_compressor = "lzo";
 /* Module params (documentation at end) */
 static unsigned int num_devices = 1;
 
+static inline void deprecated_attr_warn(const char *name)
+{
+        pr_warn_once("%d (%s) Attribute %s (and others) will be removed. %s\n",
+                        task_pid_nr(current),
+                        current->comm,
+                        name,
+                        "See zram documentation.");
+}
+
 #define ZRAM_ATTR_RO(name)                                              \
 static ssize_t name##_show(struct device *d,            \
                                 struct device_attribute *attr, char *b) \
 {                                                                       \
         struct zram *zram = dev_to_zram(d);                             \
+                                                                        \
+        deprecated_attr_warn(__stringify(name));                        \
         return scnprintf(b, PAGE_SIZE, "%llu\n",                        \
                 (u64)atomic64_read(&zram->stats.name));                 \
 }                                                                       \
@@ -89,6 +100,7 @@ static ssize_t orig_data_size_show(struct device *dev,
 {
         struct zram *zram = dev_to_zram(dev);
 
+        deprecated_attr_warn("orig_data_size");
         return scnprintf(buf, PAGE_SIZE, "%llu\n",
                 (u64)(atomic64_read(&zram->stats.pages_stored)) << PAGE_SHIFT);
 }
@@ -99,6 +111,7 @@ static ssize_t mem_used_total_show(struct device *dev,
         u64 val = 0;
         struct zram *zram = dev_to_zram(dev);
 
+        deprecated_attr_warn("mem_used_total");
         down_read(&zram->init_lock);
         if (init_done(zram)) {
                 struct zram_meta *meta = zram->meta;
@@ -128,6 +141,7 @@ static ssize_t mem_limit_show(struct device *dev,
         u64 val;
         struct zram *zram = dev_to_zram(dev);
 
+        deprecated_attr_warn("mem_limit");
         down_read(&zram->init_lock);
         val = zram->limit_pages;
         up_read(&zram->init_lock);
@@ -159,6 +173,7 @@ static ssize_t mem_used_max_show(struct device *dev,
         u64 val = 0;
         struct zram *zram = dev_to_zram(dev);
 
+        deprecated_attr_warn("mem_used_max");
         down_read(&zram->init_lock);
         if (init_done(zram))
                 val = atomic_long_read(&zram->stats.max_used_pages);
@@ -670,8 +685,12 @@ out:
 static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
                         int offset, int rw)
 {
+        unsigned long start_time = jiffies;
         int ret;
 
+        generic_start_io_acct(rw, bvec->bv_len >> SECTOR_SHIFT,
+                        &zram->disk->part0);
+
         if (rw == READ) {
                 atomic64_inc(&zram->stats.num_reads);
                 ret = zram_bvec_read(zram, bvec, index, offset);
@@ -680,6 +699,8 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
                 ret = zram_bvec_write(zram, bvec, index, offset);
         }
 
+        generic_end_io_acct(rw, &zram->disk->part0, start_time);
+
         if (unlikely(ret)) {
                 if (rw == READ)
                         atomic64_inc(&zram->stats.failed_reads);
@@ -1027,6 +1048,55 @@ static DEVICE_ATTR_RW(mem_used_max);
 static DEVICE_ATTR_RW(max_comp_streams);
 static DEVICE_ATTR_RW(comp_algorithm);
 
+static ssize_t io_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 = scnprintf(buf, PAGE_SIZE,
+                        "%8llu %8llu %8llu %8llu\n",
+                        (u64)atomic64_read(&zram->stats.failed_reads),
+                        (u64)atomic64_read(&zram->stats.failed_writes),
+                        (u64)atomic64_read(&zram->stats.invalid_io),
+                        (u64)atomic64_read(&zram->stats.notify_free));
+        up_read(&zram->init_lock);
+
+        return ret;
+}
+
+static ssize_t mm_stat_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct zram *zram = dev_to_zram(dev);
+        u64 orig_size, mem_used = 0;
+        long max_used;
+        ssize_t ret;
+
+        down_read(&zram->init_lock);
+        if (init_done(zram))
+                mem_used = zs_get_total_pages(zram->meta->mem_pool);
+
+        orig_size = atomic64_read(&zram->stats.pages_stored);
+        max_used = atomic_long_read(&zram->stats.max_used_pages);
+
+        ret = scnprintf(buf, PAGE_SIZE,
+                        "%8llu %8llu %8llu %8lu %8ld %8llu %8llu\n",
+                        orig_size << PAGE_SHIFT,
+                        (u64)atomic64_read(&zram->stats.compr_data_size),
+                        mem_used << PAGE_SHIFT,
+                        zram->limit_pages << PAGE_SHIFT,
+                        max_used << PAGE_SHIFT,
+                        (u64)atomic64_read(&zram->stats.zero_pages),
+                        (u64)atomic64_read(&zram->stats.num_migrated));
+        up_read(&zram->init_lock);
+
+        return ret;
+}
+
+static DEVICE_ATTR_RO(io_stat);
+static DEVICE_ATTR_RO(mm_stat);
 ZRAM_ATTR_RO(num_reads);
 ZRAM_ATTR_RO(num_writes);
 ZRAM_ATTR_RO(failed_reads);
@@ -1054,6 +1124,8 @@ static struct attribute *zram_disk_attrs[] = {
         &dev_attr_mem_used_max.attr,
         &dev_attr_max_comp_streams.attr,
         &dev_attr_comp_algorithm.attr,
+        &dev_attr_io_stat.attr,
+        &dev_attr_mm_stat.attr,
         NULL,
 };
 
@@ -1082,6 +1154,7 @@ static int create_device(struct zram *zram, int device_id)
         if (!zram->disk) {
                 pr_warn("Error allocating disk structure for device %d\n",
                         device_id);
+                ret = -ENOMEM;
                 goto out_free_queue;
         }
 
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index 17056e589146..570c598f4ce9 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -84,6 +84,7 @@ struct zram_stats {
         atomic64_t compr_data_size;     /* compressed size of pages stored */
         atomic64_t num_reads;   /* failed + successful */
         atomic64_t num_writes;  /* --do-- */
+        atomic64_t num_migrated;        /* no. of migrated object */
         atomic64_t failed_reads;        /* can happen when memory is too low */
         atomic64_t failed_writes;       /* can happen when memory is too low */
         atomic64_t invalid_io;  /* non-page-aligned I/O requests */