2 files changed, 7 insertions, 5 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 3e89fbbd160f..a5941872d3f7 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -3061,7 +3061,8 @@ findFirstRetry:
         pSMB->TotalParameterCount = cpu_to_le16(params);
         pSMB->ParameterCount = pSMB->TotalParameterCount;
         pSMB->ParameterOffset = cpu_to_le16(
-          offsetof(struct smb_com_transaction2_ffirst_req, SearchAttributes) - 4);
+              offsetof(struct smb_com_transaction2_ffirst_req, SearchAttributes)
+                - 4);
         pSMB->DataCount = 0;
         pSMB->DataOffset = 0;
         pSMB->SetupCount = 1;   /* one byte, no need to make endian neutral */
@@ -3084,12 +3085,12 @@ findFirstRetry:
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
         cifs_stats_inc(&tcon->num_ffirst);
 
-        if (rc) {/* BB add logic to retry regular search if Unix search rejected unexpectedly by server */
+        if (rc) {/* BB add logic to retry regular search if Unix search
+                        rejected unexpectedly by server */
                 /* BB Add code to handle unsupported level rc */
                 cFYI(1, ("Error in FindFirst = %d", rc));
 
-                if (pSMB)
-                        cifs_buf_release(pSMB);
+                cifs_buf_release(pSMB);
 
                 /* BB eventually could optimize out free and realloc of buf */
                 /*    for this case */
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 77e1fc01d747..ddd11fa15528 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -48,13 +48,14 @@ build_path_from_dentry(struct dentry *direntry)
         struct dentry *temp;
         int namelen = 0;
         char *full_path;
-        char dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb));
+        char dirsep;
 
         if(direntry == NULL)
                 return NULL;  /* not much we can do if dentry is freed and
                 we need to reopen the file after it was closed implicitly
                 when the server crashed */
 
+        dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb));
 cifs_bp_rename_retry:
         for (temp = direntry; !IS_ROOT(temp);) {
                 namelen += (1 + temp->d_name.len);