2 files changed, 6 insertions, 5 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9c288653e6d..602f77c304c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -773,10 +773,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)
                 cifs_dump_mem("Bad SMB: ", buf,
                         min_t(unsigned int, server->total_read, 48));
 
-        if (mid)
-                handle_mid(mid, server, smb_buffer, length);
+        if (!mid)
+                return length;
 
-        return length;
+        handle_mid(mid, server, smb_buffer, length);
+        return 0;
 }
 
 static int
@@ -2125,7 +2126,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
         down_read(&key->sem);
         upayload = key->payload.data;
         if (IS_ERR_OR_NULL(upayload)) {
-                rc = PTR_ERR(key);
+                rc = upayload ? PTR_ERR(upayload) : -EINVAL;
                 goto out_key_put;
         }
 
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index df8fecb5b99..63a196b97d5 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 {
         int xid;
         int rc = 0; /* to get around spurious gcc warning, set to zero here */
-        __u32 oplock = 0;
+        __u32 oplock = enable_oplocks ? REQ_OPLOCK : 0;
         __u16 fileHandle = 0;
         bool posix_open = false;
         struct cifs_sb_info *cifs_sb;