Merge branch 'linus' into perf/core

Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 20 insertions, 21 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 78db68a5cf44..0ae86ddf2213 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1653,24 +1653,26 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                          * If yes, we have encountered a double deliminator
                          * reset the NULL character to the deliminator
                          */
-                        if (tmp_end < end && tmp_end[1] == delim)
+                        if (tmp_end < end && tmp_end[1] == delim) {
                                 tmp_end[0] = delim;
 
-                        /* Keep iterating until we get to a single deliminator
-                         * OR the end
-                         */
-                        while ((tmp_end = strchr(tmp_end, delim)) != NULL &&
-                               (tmp_end[1] == delim)) {
-                                tmp_end = (char *) &tmp_end[2];
-                        }
+                                /* Keep iterating until we get to a single
+                                 * deliminator OR the end
+                                 */
+                                while ((tmp_end = strchr(tmp_end, delim))
+                                        != NULL && (tmp_end[1] == delim)) {
+                                                tmp_end = (char *) &tmp_end[2];
+                                }
 
-                        /* Reset var options to point to next element */
-                        if (tmp_end) {
-                                tmp_end[0] = '\0';
-                                options = (char *) &tmp_end[1];
-                        } else
-                                /* Reached the end of the mount option string */
-                                options = end;
+                                /* Reset var options to point to next element */
+                                if (tmp_end) {
+                                        tmp_end[0] = '\0';
+                                        options = (char *) &tmp_end[1];
+                                } else
+                                        /* Reached the end of the mount option
+                                         * string */
+                                        options = end;
+                        }
 
                         /* Now build new password string */
                         temp_len = strlen(value);
@@ -3493,18 +3495,15 @@ cifs_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *pvolume_info)
          * MS-CIFS indicates that servers are only limited by the client's
          * bufsize for reads, testing against win98se shows that it throws
          * INVALID_PARAMETER errors if you try to request too large a read.
+         * OS/2 just sends back short reads.
          *
-         * If the server advertises a MaxBufferSize of less than one page,
-         * assume that it also can't satisfy reads larger than that either.
-         *
-         * FIXME: Is there a better heuristic for this?
+         * If the server doesn't advertise CAP_LARGE_READ_X, then assume that
+         * it can't handle a read request larger than its MaxBufferSize either.
          */
         if (tcon->unix_ext && (unix_cap & CIFS_UNIX_LARGE_READ_CAP))
                 defsize = CIFS_DEFAULT_IOSIZE;
         else if (server->capabilities & CAP_LARGE_READ_X)
                 defsize = CIFS_DEFAULT_NON_POSIX_RSIZE;
-        else if (server->maxBuf >= PAGE_CACHE_SIZE)
-                defsize = CIFSMaxBufSize;
         else
                 defsize = server->maxBuf - sizeof(READ_RSP);