[PATCH v2 03/19] cifs: make decode_ascii_ssetup void return

[Jeff Layton]

...rc is always set to 0.

Signed-off-by: Jeff Layton <jlay...@redhat.com>
Acked-by: Pavel Shilovsky <pias...@etersoft.ru>
---
 fs/cifs/sess.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index f230571..838e224 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -310,11 +310,10 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct 
cifs_ses *ses,
        return;
 }
 
-static int decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
-                              struct cifs_ses *ses,
-                              const struct nls_table *nls_cp)
+static void decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
+                               struct cifs_ses *ses,
+                               const struct nls_table *nls_cp)
 {
-       int rc = 0;
        int len;
        char *bcc_ptr = *pbcc_area;
 
@@ -322,7 +321,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 
bleft,
 
        len = strnlen(bcc_ptr, bleft);
        if (len >= bleft)
-               return rc;
+               return;
 
        kfree(ses->serverOS);
 
@@ -339,7 +338,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 
bleft,
 
        len = strnlen(bcc_ptr, bleft);
        if (len >= bleft)
-               return rc;
+               return;
 
        kfree(ses->serverNOS);
 
@@ -352,7 +351,7 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 
bleft,
 
        len = strnlen(bcc_ptr, bleft);
        if (len > bleft)
-               return rc;
+               return;
 
        /* No domain field in LANMAN case. Domain is
           returned by old servers in the SMB negprot response */
@@ -360,8 +359,6 @@ static int decode_ascii_ssetup(char **pbcc_area, __u16 
bleft,
           but thus do return domain here we could add parsing
           for it later, but it is not very important */
        cifs_dbg(FYI, "ascii: bytes left %d\n", bleft);
-
-       return rc;
 }
 
 int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
@@ -938,8 +935,7 @@ ssetup_ntlmssp_authenticate:
                }
                decode_unicode_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);
        } else {
-               rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining,
-                                        ses, nls_cp);
+               decode_ascii_ssetup(&bcc_ptr, bytes_remaining, ses, nls_cp);
        }
 
 ssetup_exit:
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html