Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  Cannot allocate memory error on mount
  [CIFS] Eliminate unused variable warning

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 4bc47e5b5f29af38d601f699face0e1f16b31a9f..86a164f08a74a51399c2152799ec178c93902fa6 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -834,7 +834,7 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino)
                                                xid, NULL);
 
        if (!inode)
-               return ERR_PTR(-ENOMEM);
+               return ERR_PTR(rc);
 
 #ifdef CONFIG_CIFS_FSCACHE
        /* populate tcon->resource_id */

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 4788e16a02cc91a59cfe3b4721d19c867e97b96c..795095f4eac69ba204257a597522e465dafac371 100644 (file)
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -620,7 +620,6 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
        struct key *spnego_key = NULL;
        __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */
        bool first_time;
-       char *ntlmsspblob;
 
        if (ses == NULL)
                return -EINVAL;
@@ -868,6 +867,8 @@ ssetup_ntlmssp_authenticate:
                                iov[1].iov_base = &pSMB->req.SecurityBlob[0];
                        } else if (phase == NtLmAuthenticate) {
                                int blob_len;
+                               char *ntlmsspblob;
+
                                ntlmsspblob = kmalloc(5 *
                                        sizeof(struct _AUTHENTICATE_MESSAGE),
                                        GFP_KERNEL);