Merge tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "Highlights include:

  New features:
   - RDMA client backchannel from Chuck
   - Support for NFSv4.2 file CLONE using the btrfs ioctl

  Bugfixes + cleanups:
   - Move socket data receive out of the bottom halves and into a
     workqueue
   - Refactor NFSv4 error handling so synchronous and asynchronous RPC
     handles errors identically.
   - Fix a panic when blocks or object layouts reads return a bad data
     length
   - Fix nfsroot so it can handle a 1024 byte long path.
   - Fix bad usage of page offset in bl_read_pagelist
   - Various NFSv4 callback cleanups+fixes
   - Fix GETATTR bitmap verification
   - Support hexadecimal number for sunrpc debug sysctl files"

* tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (53 commits)
  Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug
  nfs: Fix GETATTR bitmap verification
  nfs: Remove unused xdr page offsets in getacl/setacl arguments
  fs/nfs: remove unnecessary new_valid_dev check
  SUNRPC: fix variable type
  NFS: Enable client side NFSv4.1 backchannel to use other transports
  pNFS/flexfiles: Add support for FF_FLAGS_NO_IO_THRU_MDS
  pNFS/flexfiles: When mirrored, retry failed reads by switching mirrors
  SUNRPC: Remove the TCP-only restriction in bc_svc_process()
  svcrdma: Add backward direction service for RPC/RDMA transport
  xprtrdma: Handle incoming backward direction RPC calls
  xprtrdma: Add support for sending backward direction RPC replies
  xprtrdma: Pre-allocate Work Requests for backchannel
  xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers
  SUNRPC: Abstract backchannel operations
  xprtrdma: Saving IRQs no longer needed for rb_lock
  xprtrdma: Remove reply tasklet
  xprtrdma: Use workqueue to process RPC/RDMA replies
  xprtrdma: Replace send and receive arrays
  xprtrdma: Refactor reply handler error handling
  ...

1 files changed, 12 insertions, 11 deletions

diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 887f0183b4c6..c88d9bc06f5c 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -76,7 +76,7 @@ static int
 proc_dodebug(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-        char            tmpbuf[20], c, *s;
+        char            tmpbuf[20], c, *s = NULL;
         char __user *p;
         unsigned int    value;
         size_t          left, len;
@@ -103,23 +103,24 @@ proc_dodebug(struct ctl_table *table, int write,
                         return -EFAULT;
                 tmpbuf[left] = '\0';
 
-                for (s = tmpbuf, value = 0; '0' <= *s && *s <= '9'; s++, left--)
-                        value = 10 * value + (*s - '0');
-                if (*s && !isspace(*s))
-                        return -EINVAL;
-                while (left && isspace(*s))
-                        left--, s++;
+                value = simple_strtol(tmpbuf, &s, 0);
+                if (s) {
+                        left -= (s - tmpbuf);
+                        if (left && !isspace(*s))
+                                return -EINVAL;
+                        while (left && isspace(*s))
+                                left--, s++;
+                } else
+                        left = 0;
                 *(unsigned int *) table->data = value;
                 /* Display the RPC tasks on writing to rpc_debug */
                 if (strcmp(table->procname, "rpc_debug") == 0)
                         rpc_show_tasks(&init_net);
         } else {
-                if (!access_ok(VERIFY_WRITE, buffer, left))
-                        return -EFAULT;
-                len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
+                len = sprintf(tmpbuf, "0x%04x", *(unsigned int *) table->data);
                 if (len > left)
                         len = left;
-                if (__copy_to_user(buffer, tmpbuf, len))
+                if (copy_to_user(buffer, tmpbuf, len))
                         return -EFAULT;
                 if ((left -= len) > 0) {
                         if (put_user('\n', (char __user *)buffer + len))