Merge branch 'akpm' (patches from Andrew Morton) into next

Merge more updates from Andrew Morton:

 - Most of the rest of MM.

   This includes "mark remap_file_pages syscall as deprecated" but the
   actual "replace remap_file_pages syscall with emulation" is held
   back.  I guess we'll need to work out when to pull the trigger on
   that one.

 - various minor cleanups to obscure filesystems

 - the drivers/rtc queue

 - hfsplus updates

 - ufs, hpfs, fatfs, affs, reiserfs

 - Documentation/

 - signals

 - procfs

 - cpu hotplug

 - lib/idr.c

 - rapidio

 - sysctl

 - ipc updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

1 files changed, 20 insertions, 6 deletions

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 76feb4b60fa6..d521bddf876d 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -157,11 +157,13 @@ static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field,
                            const char *buf, size_t len)
 {
         unsigned int x;
+        int rc;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
-
-        x = simple_strtoul(buf, NULL, 0);
+        rc = kstrtouint(buf, 0, &x);
+        if (rc)
+                return rc;
 
         if (check_zero && !x)
                 return -EINVAL;
@@ -730,7 +732,10 @@ static ssize_t comm_nodeid_read(struct dlm_comm *cm, char *buf)
 static ssize_t comm_nodeid_write(struct dlm_comm *cm, const char *buf,
                                  size_t len)
 {
-        cm->nodeid = simple_strtol(buf, NULL, 0);
+        int rc = kstrtoint(buf, 0, &cm->nodeid);
+
+        if (rc)
+                return rc;
         return len;
 }
 
@@ -742,7 +747,10 @@ static ssize_t comm_local_read(struct dlm_comm *cm, char *buf)
 static ssize_t comm_local_write(struct dlm_comm *cm, const char *buf,
                                 size_t len)
 {
-        cm->local= simple_strtol(buf, NULL, 0);
+        int rc = kstrtoint(buf, 0, &cm->local);
+
+        if (rc)
+                return rc;
         if (cm->local && !local_comm)
                 local_comm = cm;
         return len;
@@ -846,7 +854,10 @@ static ssize_t node_nodeid_write(struct dlm_node *nd, const char *buf,
                                  size_t len)
 {
         uint32_t seq = 0;
-        nd->nodeid = simple_strtol(buf, NULL, 0);
+        int rc = kstrtoint(buf, 0, &nd->nodeid);
+
+        if (rc)
+                return rc;
         dlm_comm_seq(nd->nodeid, &seq);
         nd->comm_seq = seq;
         return len;
@@ -860,7 +871,10 @@ static ssize_t node_weight_read(struct dlm_node *nd, char *buf)
 static ssize_t node_weight_write(struct dlm_node *nd, const char *buf,
                                  size_t len)
 {
-        nd->weight = simple_strtol(buf, NULL, 0);
+        int rc = kstrtoint(buf, 0, &nd->weight);
+
+        if (rc)
+                return rc;
         return len;
 }