7 files changed, 544 insertions, 538 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 9122ef5c3174..17ed7cf750af 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -98,7 +98,7 @@ cifs_read_super(struct super_block *sb, void *data,
        
        /* BB should we make this contingent on mount parm? */
        sb->s_flags |= MS_NODIRATIME | MS_NOATIME;
-        sb->s_fs_info = kzalloc(sizeof(struct cifs_sb_info),GFP_KERNEL);
+        sb->s_fs_info = kzalloc(sizeof(struct cifs_sb_info), GFP_KERNEL);
        cifs_sb = CIFS_SB(sb);
        if (cifs_sb == NULL)
                return -ENOMEM;
@@ -117,9 +117,10 @@ cifs_read_super(struct super_block *sb, void *data,
 #ifdef CONFIG_CIFS_EXPERIMENTAL
        if (experimEnabled != 0)
                sb->s_export_op = &cifs_export_ops;
-#endif /* EXPERIMENTAL */       
+#endif /* EXPERIMENTAL */
 /*      if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512)
-            sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */
+            sb->s_blocksize =
+                cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */
 #ifdef CONFIG_CIFS_QUOTA
        sb->s_qcop = &cifs_quotactl_ops;
 #endif
@@ -164,10 +165,10 @@ cifs_put_super(struct super_block *sb)
        cFYI(1, ("In cifs_put_super"));
        cifs_sb = CIFS_SB(sb);
        if (cifs_sb == NULL) {
-                cFYI(1,("Empty cifs superblock info passed to unmount"));
+                cFYI(1, ("Empty cifs superblock info passed to unmount"));
                return;
        }
-        rc = cifs_umount(sb, cifs_sb); 
+        rc = cifs_umount(sb, cifs_sb);
        if (rc) {
                cERROR(1, ("cifs_umount failed with return code %d", rc));
        }
@@ -180,7 +181,7 @@ static int
 cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
        struct super_block *sb = dentry->d_sb;
-        int xid; 
+        int xid;
        int rc = -EOPNOTSUPP;
        struct cifs_sb_info *cifs_sb;
        struct cifsTconInfo *pTcon;
@@ -193,7 +194,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
        buf->f_type = CIFS_MAGIC_NUMBER;
        /* instead could get the real value via SMB_QUERY_FS_ATTRIBUTE_INFO */
-        buf->f_namelen = PATH_MAX; /* PATH_MAX may be too long - it would 
+        buf->f_namelen = PATH_MAX; /* PATH_MAX may be too long - it would
                                      presumably be total path, but note
                                      that some servers (includinng Samba 3)
                                      have a shorter maximum path */
@@ -217,8 +218,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
           bypassed it because we detected that this was an older LANMAN sess */
        if (rc)
                rc = SMBOldQFSInfo(xid, pTcon, buf);
-        /*     
+        /* int f_type;
-           int f_type;
           __fsid_t f_fsid;
           int f_namelen;  */
        /* BB get from info in tcon struct at mount time call to QFSAttrInfo */
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index b4916eb6fd43..5b19ce2e4351 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -61,7 +61,7 @@ static struct {
        {LANMAN_PROT, "\2LM1.2X002"},
        {LANMAN2_PROT, "\2LANMAN2.1"},
 #endif /* weak password hashing for legacy clients */
-        {CIFS_PROT, "\2NT LM 0.12"}, 
+        {CIFS_PROT, "\2NT LM 0.12"},
        {BAD_PROT, "\2"}
 };
 #endif
@@ -84,17 +84,17 @@ static struct {
 /* Mark as invalid, all open files on tree connections since they
   were closed when session to server was lost */
-static void mark_open_files_invalid(struct cifsTconInfo * pTcon)
+static void mark_open_files_invalid(struct cifsTconInfo *pTcon)
 {
        struct cifsFileInfo *open_file = NULL;
-        struct list_head * tmp;
+        struct list_head *tmp;
-        struct list_head * tmp1;
+        struct list_head *tmp1;
 /* list all files open on tree connection and mark them invalid */
        write_lock(&GlobalSMBSeslock);
        list_for_each_safe(tmp, tmp1, &pTcon->openFileList) {
-                open_file = list_entry(tmp,struct cifsFileInfo, tlist);
+                open_file = list_entry(tmp, struct cifsFileInfo, tlist);
-                if(open_file) {
+                if (open_file) {
                        open_file->invalidHandle = TRUE;
                }
        }
@@ -113,20 +113,20 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
        /* SMBs NegProt, SessSetup, uLogoff do not have tcon yet so
           check for tcp and smb session status done differently
           for those three - in the calling routine */
-        if(tcon) {
+        if (tcon) {
-                if(tcon->tidStatus == CifsExiting) {
+                if (tcon->tidStatus == CifsExiting) {
                        /* only tree disconnect, open, and write,
                        (and ulogoff which does not have tcon)
                        are allowed as we start force umount */
-                        if((smb_command != SMB_COM_WRITE_ANDX) && 
+                        if ((smb_command != SMB_COM_WRITE_ANDX) &&
                           (smb_command != SMB_COM_OPEN_ANDX) && 
                           (smb_command != SMB_COM_TREE_DISCONNECT)) {
-                                cFYI(1,("can not send cmd %d while umounting",
+                                cFYI(1, ("can not send cmd %d while umounting",
                                        smb_command));
                                return -ENODEV;
                        }
                }
-                if((tcon->ses) && (tcon->ses->status != CifsExiting) &&
+                if ((tcon->ses) && (tcon->ses->status != CifsExiting) &&
                                  (tcon->ses->server)){
                        struct nls_table *nls_codepage;
                                /* Give Demultiplex thread up to 10 seconds to 
@@ -135,9 +135,9 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                        while(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
                                wait_event_interruptible_timeout(tcon->ses->server->response_q,
                                        (tcon->ses->server->tcpStatus == CifsGood), 10 * HZ);
-                                if(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
+                                if (tcon->ses->server->tcpStatus == CifsNeedReconnect) {
                                        /* on "soft" mounts we wait once */
-                                        if((tcon->retry == FALSE) || 
+                                        if ((tcon->retry == FALSE) ||
                                           (tcon->ses->status == CifsExiting)) {
                                                cFYI(1,("gave up waiting on reconnect in smb_init"));
                                                return -EHOSTDOWN;
@@ -153,10 +153,10 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                /* need to prevent multiple threads trying to
                simultaneously reconnect the same SMB session */
                        down(&tcon->ses->sesSem);
-                        if(tcon->ses->status == CifsNeedReconnect)
+                        if (tcon->ses->status == CifsNeedReconnect)
                                rc = cifs_setup_session(0, tcon->ses, 
                                                        nls_codepage);
-                        if(!rc && (tcon->tidStatus == CifsNeedReconnect)) {
+                        if (!rc && (tcon->tidStatus == CifsNeedReconnect)) {
                                mark_open_files_invalid(tcon);
                                rc = CIFSTCon(0, tcon->ses, tcon->treeName, 
                                              tcon, nls_codepage);
@@ -170,7 +170,7 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                                /* BB FIXME add code to check if wsize needs
                                   update due to negotiated smb buffer size
                                   shrinking */
-                                if(rc == 0)
+                                if (rc == 0)
                                        atomic_inc(&tconInfoReconnectCount);
                                cFYI(1, ("reconnect tcon rc = %d", rc));
@@ -200,7 +200,7 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                        return -EIO;
                }
        }
-        if(rc)
+        if (rc)
                return rc;
        *request_buf = cifs_small_buf_get();
@@ -211,8 +211,8 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
        header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,wct);
-        if(tcon != NULL)
+        if (tcon != NULL)
-                cifs_stats_inc(&tcon->num_smbs_sent);
+                cifs_stats_inc(&tcon->num_smbs_sent);
        return rc;
 }
@@ -225,7 +225,7 @@ small_smb_init_no_tc(const int smb_command, const int wct,
        struct smb_hdr * buffer;
        rc = small_smb_init(smb_command, wct, NULL, request_buf);
-        if(rc)
+        if (rc)
                return rc;
        buffer = (struct smb_hdr *)*request_buf;
@@ -254,21 +254,21 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
        /* SMBs NegProt, SessSetup, uLogoff do not have tcon yet so
           check for tcp and smb session status done differently
           for those three - in the calling routine */
-        if(tcon) {
+        if (tcon) {
-                if(tcon->tidStatus == CifsExiting) {
+                if (tcon->tidStatus == CifsExiting) {
                        /* only tree disconnect, open, and write,
                          (and ulogoff which does not have tcon)
                          are allowed as we start force umount */
-                        if((smb_command != SMB_COM_WRITE_ANDX) &&
+                        if ((smb_command != SMB_COM_WRITE_ANDX) &&
                           (smb_command != SMB_COM_OPEN_ANDX) &&
                           (smb_command != SMB_COM_TREE_DISCONNECT)) {
-                                cFYI(1,("can not send cmd %d while umounting",
+                                cFYI(1, ("can not send cmd %d while umounting",
                                        smb_command));
                                return -ENODEV;
                        }
                }
-                if((tcon->ses) && (tcon->ses->status != CifsExiting) && 
+                if ((tcon->ses) && (tcon->ses->status != CifsExiting) &&
                                  (tcon->ses->server)){
                        struct nls_table *nls_codepage;
                                /* Give Demultiplex thread up to 10 seconds to
@@ -277,10 +277,10 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                        while(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
                                wait_event_interruptible_timeout(tcon->ses->server->response_q,
                                        (tcon->ses->server->tcpStatus == CifsGood), 10 * HZ);
-                                if(tcon->ses->server->tcpStatus == 
+                                if (tcon->ses->server->tcpStatus ==
                                                CifsNeedReconnect) {
                                        /* on "soft" mounts we wait once */
-                                        if((tcon->retry == FALSE) || 
+                                        if ((tcon->retry == FALSE) ||
                                           (tcon->ses->status == CifsExiting)) {
                                                cFYI(1,("gave up waiting on reconnect in smb_init"));
                                                return -EHOSTDOWN;
@@ -296,10 +296,10 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                /* need to prevent multiple threads trying to
                simultaneously reconnect the same SMB session */
                        down(&tcon->ses->sesSem);
-                        if(tcon->ses->status == CifsNeedReconnect)
+                        if (tcon->ses->status == CifsNeedReconnect)
                                rc = cifs_setup_session(0, tcon->ses, 
                                                        nls_codepage);
-                        if(!rc && (tcon->tidStatus == CifsNeedReconnect)) {
+                        if (!rc && (tcon->tidStatus == CifsNeedReconnect)) {
                                mark_open_files_invalid(tcon);
                                rc = CIFSTCon(0, tcon->ses, tcon->treeName,
                                              tcon, nls_codepage);
@@ -313,7 +313,7 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                                /* BB FIXME add code to check if wsize needs
                                update due to negotiated smb buffer size
                                shrinking */
-                                if(rc == 0)
+                                if (rc == 0)
                                        atomic_inc(&tconInfoReconnectCount);
                                cFYI(1, ("reconnect tcon rc = %d", rc));
@@ -343,7 +343,7 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                        return -EIO;
                }
        }
-        if(rc)
+        if (rc)
                return rc;
        *request_buf = cifs_buf_get();
@@ -355,14 +355,14 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
    /* potential retries of smb operations it turns out we can determine */
    /* from the mid flags when the request buffer can be resent without  */
    /* having to use a second distinct buffer for the response */
-        if(response_buf)
+        if (response_buf)
                *response_buf = *request_buf; 
        header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,
                        wct /*wct */ );
-        if(tcon != NULL)
+        if (tcon != NULL)
-                cifs_stats_inc(&tcon->num_smbs_sent);
+                cifs_stats_inc(&tcon->num_smbs_sent);
        return rc;
 }
@@ -375,19 +375,19 @@ static int validate_t2(struct smb_t2_rsp * pSMB)
        /* check for plausible wct, bcc and t2 data and parm sizes */
        /* check for parm and data offset going beyond end of smb */
-        if(pSMB->hdr.WordCount >= 10) {
+        if (pSMB->hdr.WordCount >= 10) {
-                if((le16_to_cpu(pSMB->t2_rsp.ParameterOffset) <= 1024) &&
+                if ((le16_to_cpu(pSMB->t2_rsp.ParameterOffset) <= 1024) &&
                   (le16_to_cpu(pSMB->t2_rsp.DataOffset) <= 1024)) {
                        /* check that bcc is at least as big as parms + data */
                        /* check that bcc is less than negotiated smb buffer */
                        total_size = le16_to_cpu(pSMB->t2_rsp.ParameterCount);
-                        if(total_size < 512) {
+                        if (total_size < 512) {
                                total_size+=le16_to_cpu(pSMB->t2_rsp.DataCount);
                                /* BCC le converted in SendReceive */
                                pBCC = (pSMB->hdr.WordCount * 2) + 
                                        sizeof(struct smb_hdr) +
                                        (char *)pSMB;
-                                if((total_size <= (*(u16 *)pBCC)) && 
+                                if ((total_size <= (*(u16 *)pBCC)) &&
                                   (total_size < 
                                        CIFSMaxBufSize+MAX_CIFS_HDR_SIZE)) {
                                        return 0;
@@ -413,7 +413,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
        unsigned int secFlags;
        u16 dialect;
-        if(ses->server)
+        if (ses->server)
                server = ses->server;
        else {
                rc = -EIO;
@@ -425,7 +425,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                return rc;
        /* if any of auth flags (ie not sign or seal) are overriden use them */
-        if(ses->overrideSecFlg & (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL)))
+        if (ses->overrideSecFlg & (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL)))
                secFlags = ses->overrideSecFlg;  /* BB FIXME fix sign flags? */
        else /* if override flags set only sign/seal OR them with global auth */
                secFlags = extended_security | ses->overrideSecFlg;
@@ -452,22 +452,22 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                goto neg_err_exit;
        dialect = le16_to_cpu(pSMBr->DialectIndex);
-        cFYI(1,("Dialect: %d", dialect));
+        cFYI(1, ("Dialect: %d", dialect));
        /* Check wct = 1 error case */
-        if((pSMBr->hdr.WordCount < 13) || (dialect == BAD_PROT)) {
+        if ((pSMBr->hdr.WordCount < 13) || (dialect == BAD_PROT)) {
                /* core returns wct = 1, but we do not ask for core - otherwise
                small wct just comes when dialect index is -1 indicating we 
                could not negotiate a common dialect */
                rc = -EOPNOTSUPP;
                goto neg_err_exit;
 #ifdef CONFIG_CIFS_WEAK_PW_HASH 
-        } else if((pSMBr->hdr.WordCount == 13)
+        } else if ((pSMBr->hdr.WordCount == 13)
                        && ((dialect == LANMAN_PROT)
                                || (dialect == LANMAN2_PROT))) {
                __s16 tmp;
                struct lanman_neg_rsp * rsp = (struct lanman_neg_rsp *)pSMBr;
-                if((secFlags & CIFSSEC_MAY_LANMAN) || 
+                if ((secFlags & CIFSSEC_MAY_LANMAN) ||
                        (secFlags & CIFSSEC_MAY_PLNTXT))
                        server->secType = LANMAN;
                else {
@@ -483,7 +483,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                GETU32(server->sessid) = le32_to_cpu(rsp->SessionKey);
                /* even though we do not use raw we might as well set this
                accurately, in case we ever find a need for it */
-                if((le16_to_cpu(rsp->RawMode) & RAW_ENABLE) == RAW_ENABLE) {
+                if ((le16_to_cpu(rsp->RawMode) & RAW_ENABLE) == RAW_ENABLE) {
                        server->maxRw = 0xFF00;
                        server->capabilities = CAP_MPX_MODE | CAP_RAW_MODE;
                } else {
@@ -511,16 +511,16 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                        seconds = val < 0 ? -val : val;
                        result = (seconds / MIN_TZ_ADJ) * MIN_TZ_ADJ;
                        remain = seconds % MIN_TZ_ADJ;
-                        if(remain >= (MIN_TZ_ADJ / 2))
+                        if (remain >= (MIN_TZ_ADJ / 2))
                                result += MIN_TZ_ADJ;
-                        if(val < 0)
+                        if (val < 0)
                                result = - result;
                        server->timeAdj = result;
                } else {
                        server->timeAdj = (int)tmp;
                        server->timeAdj *= 60; /* also in seconds */
                }
-                cFYI(1,("server->timeAdj: %d seconds", server->timeAdj));
+                cFYI(1, ("server->timeAdj: %d seconds", server->timeAdj));
                /* BB get server time for time conversions and add
@@ -535,39 +535,39 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                        goto neg_err_exit;
                }
-                cFYI(1,("LANMAN negotiated"));
+                cFYI(1, ("LANMAN negotiated"));
                /* we will not end up setting signing flags - as no signing
                was in LANMAN and server did not return the flags on */
                goto signing_check;
 #else /* weak security disabled */
-        } else if(pSMBr->hdr.WordCount == 13) {
+        } else if (pSMBr->hdr.WordCount == 13) {
                cERROR(1,("mount failed, cifs module not built "
                          "with CIFS_WEAK_PW_HASH support"));
                        rc = -EOPNOTSUPP;
 #endif /* WEAK_PW_HASH */
                goto neg_err_exit;
-        } else if(pSMBr->hdr.WordCount != 17) {
+        } else if (pSMBr->hdr.WordCount != 17) {
                /* unknown wct */
                rc = -EOPNOTSUPP;
                goto neg_err_exit;
        }
        /* else wct == 17 NTLM */
        server->secMode = pSMBr->SecurityMode;
-        if((server->secMode & SECMODE_USER) == 0)
+        if ((server->secMode & SECMODE_USER) == 0)
-                cFYI(1,("share mode security"));
+                cFYI(1, ("share mode security"));
-        if((server->secMode & SECMODE_PW_ENCRYPT) == 0)
+        if ((server->secMode & SECMODE_PW_ENCRYPT) == 0)
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
                if ((secFlags & CIFSSEC_MAY_PLNTXT) == 0)
 #endif /* CIFS_WEAK_PW_HASH */
                        cERROR(1,("Server requests plain text password"
                                  " but client support disabled"));
-        if((secFlags & CIFSSEC_MUST_NTLMV2) == CIFSSEC_MUST_NTLMV2)
+        if ((secFlags & CIFSSEC_MUST_NTLMV2) == CIFSSEC_MUST_NTLMV2)
                server->secType = NTLMv2;
-        else if(secFlags & CIFSSEC_MAY_NTLM)
+        else if (secFlags & CIFSSEC_MAY_NTLM)
                server->secType = NTLM;
-        else if(secFlags & CIFSSEC_MAY_NTLMV2)
+        else if (secFlags & CIFSSEC_MAY_NTLMV2)
                server->secType = NTLMv2;
        /* else krb5 ... any others ... */
@@ -620,7 +620,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                                                 SecurityBlob,
                                                 count - 16,
                                                 &server->secType);
-                        if(rc == 1) {
+                        if (rc == 1) {
                        /* BB Need to fill struct for sessetup here */
                                rc = -EOPNOTSUPP;
                        } else {
@@ -637,7 +637,7 @@ signing_check:
                /* MUST_SIGN already includes the MAY_SIGN FLAG
                   so if this is zero it means that signing is disabled */
                cFYI(1, ("Signing disabled"));
-                if(server->secMode & SECMODE_SIGN_REQUIRED)
+                if (server->secMode & SECMODE_SIGN_REQUIRED)
                        cERROR(1, ("Server requires "
                                   "/proc/fs/cifs/PacketSigningEnabled "
                                   "to be on"));
@@ -655,7 +655,7 @@ signing_check:
                        server->secMode |= SECMODE_SIGN_REQUIRED;
        } else {
                /* signing optional ie CIFSSEC_MAY_SIGN */
-                if((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
+                if ((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
                        server->secMode &= 
                                ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
        }
@@ -663,7 +663,7 @@ signing_check:
 neg_err_exit:   
        cifs_buf_release(pSMB);
-        cFYI(1,("negprot rc %d",rc));
+        cFYI(1, ("negprot rc %d", rc));
        return rc;
 }
@@ -696,12 +696,12 @@ CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon)
        /* No need to return error on this operation if tid invalidated and 
        closed on server already e.g. due to tcp session crashing */
-        if(tcon->tidStatus == CifsNeedReconnect) {
+        if (tcon->tidStatus == CifsNeedReconnect) {
                up(&tcon->tconSem);
                return 0;  
        }
-        if((tcon->ses == NULL) || (tcon->ses->server == NULL)) {    
+        if ((tcon->ses == NULL) || (tcon->ses->server == NULL)) {
                up(&tcon->tconSem);
                return -EIO;
        }
@@ -757,10 +757,10 @@ CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses)
        smb_buffer_response = (struct smb_hdr *)pSMB; /* BB removeme BB */
        
-        if(ses->server) {
+        if (ses->server) {
                pSMB->hdr.Mid = GetNextMid(ses->server);
-                if(ses->server->secMode & 
+                if (ses->server->secMode &
                   (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                        pSMB->hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
        }
@@ -999,7 +999,7 @@ PsxCreat:
                goto psx_create_err;
        }
-        cFYI(1,("copying inode info"));
+        cFYI(1, ("copying inode info"));
        rc = validate_t2((struct smb_t2_rsp *)pSMBr);
        if (rc || (pSMBr->ByteCount < sizeof(OPEN_PSX_RSP))) {
@@ -1012,20 +1012,20 @@ PsxCreat:
                        + le16_to_cpu(pSMBr->t2.DataOffset));
                
        *pOplock = le16_to_cpu(psx_rsp->OplockFlags);
-        if(netfid)
+        if (netfid)
                *netfid = psx_rsp->Fid;   /* cifs fid stays in le */
        /* Let caller know file was created so we can set the mode. */
        /* Do we care about the CreateAction in any other cases? */
-        if(cpu_to_le32(FILE_CREATE) == psx_rsp->CreateAction)
+        if (cpu_to_le32(FILE_CREATE) == psx_rsp->CreateAction)
                *pOplock |= CIFS_CREATE_ACTION;
        /* check to make sure response data is there */
-        if(psx_rsp->ReturnedLevel != SMB_QUERY_FILE_UNIX_BASIC) {
+        if (psx_rsp->ReturnedLevel != SMB_QUERY_FILE_UNIX_BASIC) {
                pRetData->Type = -1; /* unknown */
 #ifdef CONFIG_CIFS_DEBUG2
-                cFYI(1,("unknown type"));
+                cFYI(1, ("unknown type"));
 #endif
        } else {
-                if(pSMBr->ByteCount < sizeof(OPEN_PSX_RSP) 
+                if (pSMBr->ByteCount < sizeof(OPEN_PSX_RSP)
                                        + sizeof(FILE_UNIX_BASIC_INFO)) {
                        cERROR(1,("Open response data too small"));
                        pRetData->Type = -1;
@@ -1072,7 +1072,7 @@ static __u16 convert_disposition(int disposition)
                        ofun = SMBOPEN_OCREATE | SMBOPEN_OTRUNC;
                        break;
                default:
-                        cFYI(1,("unknown disposition %d",disposition));
+                        cFYI(1, ("unknown disposition %d", disposition));
                        ofun =  SMBOPEN_OAPPEND; /* regular open */
        }
        return ofun;
@@ -1131,9 +1131,9 @@ OldOpenRetry:
           as fifo and server expecting SFU style and
           no Unix extensions */
-        if(create_options & CREATE_OPTION_SPECIAL)
+        if (create_options & CREATE_OPTION_SPECIAL)
-                pSMB->FileAttributes = cpu_to_le16(ATTR_SYSTEM);
+                pSMB->FileAttributes = cpu_to_le16(ATTR_SYSTEM);
-        else
+        else
                pSMB->FileAttributes = cpu_to_le16(0/*ATTR_NORMAL*/); /* BB FIXME */
        /* if ((omode & S_IWUGO) == 0)
@@ -1167,11 +1167,11 @@ OldOpenRetry:
                /* Let caller know file was created so we can set the mode. */
                /* Do we care about the CreateAction in any other cases? */
        /* BB FIXME BB */
-/*              if(cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction)
+/*              if (cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction)
                        *pOplock |= CIFS_CREATE_ACTION; */
        /* BB FIXME END */
-                if(pfile_info) {
+                if (pfile_info) {
                        pfile_info->CreationTime = 0; /* BB convert CreateTime*/
                        pfile_info->LastAccessTime = 0; /* BB fixme */
                        pfile_info->LastWriteTime = 0; /* BB fixme */
@@ -1239,7 +1239,7 @@ openRetry:
        /* set file as system file if special file such
           as fifo and server expecting SFU style and
           no Unix extensions */
-        if(create_options & CREATE_OPTION_SPECIAL)
+        if (create_options & CREATE_OPTION_SPECIAL)
                pSMB->FileAttributes = cpu_to_le32(ATTR_SYSTEM);
        else
                pSMB->FileAttributes = cpu_to_le32(ATTR_NORMAL);
@@ -1277,9 +1277,9 @@ openRetry:
                *netfid = pSMBr->Fid;   /* cifs fid stays in le */
                /* Let caller know file was created so we can set the mode. */
                /* Do we care about the CreateAction in any other cases? */
-                if(cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction)
+                if (cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction)
                        *pOplock |= CIFS_CREATE_ACTION; 
-                if(pfile_info) {
+                if (pfile_info) {
                    memcpy((char *)pfile_info,(char *)&pSMBr->CreationTime,
                        36 /* CreationTime to Attributes */);
                    /* the file_info buf is endian converted by caller */
@@ -1309,8 +1309,8 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
        int resp_buf_type = 0;
        struct kvec iov[1];
-        cFYI(1,("Reading %d bytes on fid %d",count,netfid));
+        cFYI(1, ("Reading %d bytes on fid %d", count, netfid));
-        if(tcon->ses->capabilities & CAP_LARGE_FILES)
+        if (tcon->ses->capabilities & CAP_LARGE_FILES)
                wct = 12;
        else
                wct = 10; /* old style read */
@@ -1327,15 +1327,15 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
        pSMB->AndXCommand = 0xFF;       /* none */
        pSMB->Fid = netfid;
        pSMB->OffsetLow = cpu_to_le32(lseek & 0xFFFFFFFF);
-        if(wct == 12)
+        if (wct == 12)
                pSMB->OffsetHigh = cpu_to_le32(lseek >> 32);
-        else if((lseek >> 32) > 0) /* can not handle this big offset for old */
+        else if ((lseek >> 32) > 0) /* can not handle this big offset for old */
                return -EIO;
        pSMB->Remaining = 0;
        pSMB->MaxCount = cpu_to_le16(count & 0xFFFF);
        pSMB->MaxCountHigh = cpu_to_le32(count >> 16);
-        if(wct == 12)
+        if (wct == 12)
                pSMB->ByteCount = 0;  /* no need to do le conversion since 0 */
        else {
                /* old style read */
@@ -1368,27 +1368,27 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
                } else {
                        pReadData = (char *) (&pSMBr->hdr.Protocol) +
                            le16_to_cpu(pSMBr->DataOffset);
-/*                      if(rc = copy_to_user(buf, pReadData, data_length)) {
+/*                      if (rc = copy_to_user(buf, pReadData, data_length)) {
                                cERROR(1,("Faulting on read rc = %d",rc));
                                rc = -EFAULT;
                        }*/ /* can not use copy_to_user when using page cache*/
-                        if(*buf)
+                        if (*buf)
                                memcpy(*buf,pReadData,data_length);
                }
        }
 /*      cifs_small_buf_release(pSMB); */ /* Freed earlier now in SendReceive2 */
-        if(*buf) {
+        if (*buf) {
-                if(resp_buf_type == CIFS_SMALL_BUFFER)
+                if (resp_buf_type == CIFS_SMALL_BUFFER)
                        cifs_small_buf_release(iov[0].iov_base);
-                else if(resp_buf_type == CIFS_LARGE_BUFFER)
+                else if (resp_buf_type == CIFS_LARGE_BUFFER)
                        cifs_buf_release(iov[0].iov_base);
-        } else if(resp_buf_type != CIFS_NO_BUFFER) {
+        } else if (resp_buf_type != CIFS_NO_BUFFER) {
                /* return buffer to caller to free */ 
                *buf = iov[0].iov_base;         
-                if(resp_buf_type == CIFS_SMALL_BUFFER)
+                if (resp_buf_type == CIFS_SMALL_BUFFER)
                        *pbuf_type = CIFS_SMALL_BUFFER;
-                else if(resp_buf_type == CIFS_LARGE_BUFFER)
+                else if (resp_buf_type == CIFS_LARGE_BUFFER)
                        *pbuf_type = CIFS_LARGE_BUFFER;
        } /* else no valid buffer on return - leave as null */
@@ -1412,10 +1412,10 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        __u16 byte_count;
        /* cFYI(1,("write at %lld %d bytes",offset,count));*/
-        if(tcon->ses == NULL)
+        if (tcon->ses == NULL)
                return -ECONNABORTED;
-        if(tcon->ses->capabilities & CAP_LARGE_FILES)
+        if (tcon->ses->capabilities & CAP_LARGE_FILES)
                wct = 14;
        else
                wct = 12;
@@ -1431,9 +1431,9 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        pSMB->AndXCommand = 0xFF;       /* none */
        pSMB->Fid = netfid;
        pSMB->OffsetLow = cpu_to_le32(offset & 0xFFFFFFFF);
-        if(wct == 14) 
+        if (wct == 14)
                pSMB->OffsetHigh = cpu_to_le32(offset >> 32);
-        else if((offset >> 32) > 0) /* can not handle this big offset for old */
+        else if ((offset >> 32) > 0) /* can not handle big offset for old srv */
                return -EIO;
        
        pSMB->Reserved = 0xFFFFFFFF;
@@ -1444,7 +1444,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        can send more if LARGE_WRITE_X capability returned by the server and if
        our buffer is big enough or if we convert to iovecs on socket writes
        and eliminate the copy to the CIFS buffer */
-        if(tcon->ses->capabilities & CAP_LARGE_WRITE_X) {
+        if (tcon->ses->capabilities & CAP_LARGE_WRITE_X) {
                bytes_sent = min_t(const unsigned int, CIFSMaxBufSize, count);
        } else {
                bytes_sent = (tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE)
@@ -1455,10 +1455,10 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
                bytes_sent = count;
        pSMB->DataOffset =
                cpu_to_le16(offsetof(struct smb_com_write_req,Data) - 4);
-        if(buf)
+        if (buf)
            memcpy(pSMB->Data,buf,bytes_sent);
-        else if(ubuf) {
+        else if (ubuf) {
-                if(copy_from_user(pSMB->Data,ubuf,bytes_sent)) {
+                if (copy_from_user(pSMB->Data, ubuf, bytes_sent)) {
                        cifs_buf_release(pSMB);
                        return -EFAULT;
                }
@@ -1467,7 +1467,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
                cifs_buf_release(pSMB);
                return -EINVAL;
        } /* else setting file size with write of zero bytes */
-        if(wct == 14)
+        if (wct == 14)
                byte_count = bytes_sent + 1; /* pad */
        else /* wct == 12 */ {
                byte_count = bytes_sent + 5; /* bigger pad, smaller smb hdr */
@@ -1476,7 +1476,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        pSMB->DataLengthHigh = cpu_to_le16(bytes_sent >> 16);
        pSMB->hdr.smb_buf_length += byte_count;
-        if(wct == 14)
+        if (wct == 14)
                pSMB->ByteCount = cpu_to_le16(byte_count);
        else { /* old style write has byte count 4 bytes earlier so 4 bytes pad  */
                struct smb_com_writex_req * pSMBW = 
@@ -1516,9 +1516,9 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
        int smb_hdr_len;
        int resp_buf_type = 0;
-        cFYI(1,("write2 at %lld %d bytes", (long long)offset, count));
+        cFYI(1, ("write2 at %lld %d bytes", (long long)offset, count));
-        if(tcon->ses->capabilities & CAP_LARGE_FILES)
+        if (tcon->ses->capabilities & CAP_LARGE_FILES)
                wct = 14;
        else
                wct = 12;
@@ -1532,9 +1532,9 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
        pSMB->AndXCommand = 0xFF;       /* none */
        pSMB->Fid = netfid;
        pSMB->OffsetLow = cpu_to_le32(offset & 0xFFFFFFFF);
-        if(wct == 14)
+        if (wct == 14)
                pSMB->OffsetHigh = cpu_to_le32(offset >> 32);
-        else if((offset >> 32) > 0) /* can not handle this big offset for old */
+        else if ((offset >> 32) > 0) /* can not handle big offset for old srv */
                return -EIO;
        pSMB->Reserved = 0xFFFFFFFF;
        pSMB->WriteMode = 0;
@@ -1546,11 +1546,11 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
        pSMB->DataLengthLow = cpu_to_le16(count & 0xFFFF);
        pSMB->DataLengthHigh = cpu_to_le16(count >> 16);
        smb_hdr_len = pSMB->hdr.smb_buf_length + 1; /* hdr + 1 byte pad */
-        if(wct == 14)
+        if (wct == 14)
                pSMB->hdr.smb_buf_length += count+1;
        else /* wct == 12 */
-                pSMB->hdr.smb_buf_length += count+5; /* smb data starts later */ 
+                pSMB->hdr.smb_buf_length += count+5; /* smb data starts later */
-        if(wct == 14)
+        if (wct == 14)
                pSMB->ByteCount = cpu_to_le16(count + 1);
        else /* wct == 12 */ /* bigger pad, smaller smb hdr, keep offset ok */ {
                struct smb_com_writex_req * pSMBW =
@@ -1558,7 +1558,7 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
                pSMBW->ByteCount = cpu_to_le16(count + 5);
        }
        iov[0].iov_base = pSMB;
-        if(wct == 14)
+        if (wct == 14)
                iov[0].iov_len = smb_hdr_len + 4;
        else /* wct == 12 pad bigger by four bytes */
                iov[0].iov_len = smb_hdr_len + 8;
@@ -1570,7 +1570,7 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
        if (rc) {
                cFYI(1, ("Send error Write2 = %d", rc));
                *nbytes = 0;
-        } else if(resp_buf_type == 0) {
+        } else if (resp_buf_type == 0) {
                /* presumably this can not happen, but best to be safe */
                rc = -EIO;
                *nbytes = 0;
@@ -1582,9 +1582,9 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
        } 
 /*      cifs_small_buf_release(pSMB); */ /* Freed earlier now in SendReceive2 */
-        if(resp_buf_type == CIFS_SMALL_BUFFER)
+        if (resp_buf_type == CIFS_SMALL_BUFFER)
                cifs_small_buf_release(iov[0].iov_base);
-        else if(resp_buf_type == CIFS_LARGE_BUFFER)
+        else if (resp_buf_type == CIFS_LARGE_BUFFER)
                cifs_buf_release(iov[0].iov_base);
        /* Note: On -EAGAIN error only caller can retry on handle based calls 
@@ -1615,7 +1615,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
        pSMBr = (LOCK_RSP *)pSMB; /* BB removeme BB */
-        if(lockType == LOCKING_ANDX_OPLOCK_RELEASE) {
+        if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {
                timeout = -1; /* no response expected */
                pSMB->Timeout = 0;
        } else if (waitFlag == TRUE) {
@@ -1631,7 +1631,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
        pSMB->AndXCommand = 0xFF;       /* none */
        pSMB->Fid = smb_file_id; /* netfid stays le */
-        if((numLock != 0) || (numUnlock != 0)) {
+        if ((numLock != 0) || (numUnlock != 0)) {
                pSMB->Locks[0].Pid = cpu_to_le16(current->tgid);
                /* BB where to store pid high? */
                pSMB->Locks[0].LengthLow = cpu_to_le32((u32)len);
@@ -1681,7 +1681,7 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
        cFYI(1, ("Posix Lock"));
-        if(pLockData == NULL)
+        if (pLockData == NULL)
                return EINVAL;
        rc = small_smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB);
@@ -1706,7 +1706,7 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
        pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */
        pSMB->SetupCount = 1;
        pSMB->Reserved3 = 0;
-        if(get_flag)
+        if (get_flag)
                pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);
        else
                pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);
@@ -1720,7 +1720,7 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
                        (((char *) &pSMB->hdr.Protocol) + offset);
        parm_data->lock_type = cpu_to_le16(lock_type);
-        if(waitFlag) {
+        if (waitFlag) {
                timeout = 3;  /* blocking operation, no timeout */
                parm_data->lock_flags = cpu_to_le16(1);
                pSMB->Timeout = cpu_to_le32(-1);
@@ -1757,19 +1757,19 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
                        rc = -EIO;      /* bad smb */
                        goto plk_err_exit;
                }
-                if(pLockData == NULL) {
+                if (pLockData == NULL) {
                        rc = -EINVAL;
                        goto plk_err_exit;
                }
                data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
                data_count  = le16_to_cpu(pSMBr->t2.DataCount);
-                if(data_count < sizeof(struct cifs_posix_lock)) {
+                if (data_count < sizeof(struct cifs_posix_lock)) {
                        rc = -EIO;
                        goto plk_err_exit;
                }
                parm_data = (struct cifs_posix_lock *)
                        ((char *)&pSMBr->hdr.Protocol + data_offset);
-                if(parm_data->lock_type == cpu_to_le16(CIFS_UNLCK))
+                if (parm_data->lock_type == cpu_to_le16(CIFS_UNLCK))
                        pLockData->fl_type = F_UNLCK;
        }
 
@@ -1795,7 +1795,7 @@ CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
 /* do not retry on dead session on close */
        rc = small_smb_init(SMB_COM_CLOSE, 3, tcon, (void **) &pSMB);
-        if(rc == -EAGAIN)
+        if (rc == -EAGAIN)
                return 0;
        if (rc)
                return rc;
@@ -1809,7 +1809,7 @@ CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&tcon->num_closes);
        if (rc) {
-                if(rc!=-EINTR) {
+                if (rc != -EINTR) {
                        /* EINTR is expected when user ctl-c to kill app */
                        cERROR(1, ("Send error in Close = %d", rc));
                }
@@ -1818,7 +1818,7 @@ CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id)
        cifs_small_buf_release(pSMB);
        /* Since session is dead, file will be closed on server already */
-        if(rc == -EAGAIN)
+        if (rc == -EAGAIN)
                rc = 0;
        return rc;
@@ -1938,7 +1938,7 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
        rename_info->overwrite = cpu_to_le32(1);
        rename_info->root_fid  = 0;
        /* unicode only call */
-        if(target_name == NULL) {
+        if (target_name == NULL) {
                sprintf(dummy_string,"cifs%x",pSMB->hdr.Mid);
                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
                                        dummy_string, 24, nls_codepage, remap);
@@ -1961,7 +1961,7 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&pTcon->num_t2renames);
        if (rc) {
-                cFYI(1,("Send error in Rename (by file handle) = %d", rc));
+                cFYI(1, ("Send error in Rename (by file handle) = %d", rc));
        }
        cifs_buf_release(pSMB);
@@ -2434,7 +2434,7 @@ validate_ntransact(char * buf, char ** ppparm, char ** ppdata,
        __u32 data_count, data_offset, parm_count, parm_offset;
        struct smb_com_ntransact_rsp * pSMBr;
-        if(buf == NULL)
+        if (buf == NULL)
                return -EINVAL;
        pSMBr = (struct smb_com_ntransact_rsp *)buf;
@@ -2453,21 +2453,21 @@ validate_ntransact(char * buf, char ** ppparm, char ** ppdata,
        *ppdata = (char *)&pSMBr->hdr.Protocol + data_offset;
        /* should we also check that parm and data areas do not overlap? */
-        if(*ppparm > end_of_smb) {
+        if (*ppparm > end_of_smb) {
-                cFYI(1,("parms start after end of smb"));
+                cFYI(1, ("parms start after end of smb"));
                return -EINVAL;
-        } else if(parm_count + *ppparm > end_of_smb) {
+        } else if (parm_count + *ppparm > end_of_smb) {
-                cFYI(1,("parm end after end of smb"));
+                cFYI(1, ("parm end after end of smb"));
                return -EINVAL;
-        } else if(*ppdata > end_of_smb) {
+        } else if (*ppdata > end_of_smb) {
-                cFYI(1,("data starts after end of smb"));
+                cFYI(1, ("data starts after end of smb"));
                return -EINVAL;
-        } else if(data_count + *ppdata > end_of_smb) {
+        } else if (data_count + *ppdata > end_of_smb) {
                cFYI(1,("data %p + count %d (%p) ends after end of smb %p start %p",
                        *ppdata, data_count, (data_count + *ppdata), end_of_smb, pSMBr));  /* BB FIXME */
                return -EINVAL;
-        } else if(parm_count + data_count > pSMBr->ByteCount) {
+        } else if (parm_count + data_count > pSMBr->ByteCount) {
-                cFYI(1,("parm count and data count larger than SMB"));
+                cFYI(1, ("parm count and data count larger than SMB"));
                return -EINVAL;
        }
        return 0;
@@ -2522,18 +2522,18 @@ CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon,
                /* BB also check enough total bytes returned */
                        rc = -EIO;      /* bad smb */
                else {
-                        if(data_count && (data_count < 2048)) {
+                        if (data_count && (data_count < 2048)) {
                                char * end_of_smb = 2 /* sizeof byte count */ +
                                                pSMBr->ByteCount +
                                                (char *)&pSMBr->ByteCount;
                                struct reparse_data * reparse_buf = (struct reparse_data *)
                                        ((char *)&pSMBr->hdr.Protocol + data_offset);
-                                if((char*)reparse_buf >= end_of_smb) {
+                                if ((char *)reparse_buf >= end_of_smb) {
                                        rc = -EIO;
                                        goto qreparse_out;
                                }
-                                if((reparse_buf->LinkNamesBuf + 
+                                if ((reparse_buf->LinkNamesBuf +
                                        reparse_buf->TargetNameOffset +
                                        reparse_buf->TargetNameLen) >
                                                end_of_smb) {
@@ -2602,17 +2602,17 @@ static int cifs_copy_posix_acl(char * trgt,char * src, const int buflen,
        if (le16_to_cpu(cifs_acl->version) != CIFS_ACL_VERSION)
                return -EOPNOTSUPP;
-        if(acl_type & ACL_TYPE_ACCESS) {
+        if (acl_type & ACL_TYPE_ACCESS) {
                count = le16_to_cpu(cifs_acl->access_entry_count);
                pACE = &cifs_acl->ace_array[0];
                size = sizeof(struct cifs_posix_acl);
                size += sizeof(struct cifs_posix_ace) * count;
                /* check if we would go beyond end of SMB */
-                if(size_of_data_area < size) {
+                if (size_of_data_area < size) {
                        cFYI(1,("bad CIFS POSIX ACL size %d vs. %d",size_of_data_area,size));
                        return -EINVAL;
                }
-        } else if(acl_type & ACL_TYPE_DEFAULT) {
+        } else if (acl_type & ACL_TYPE_DEFAULT) {
                count = le16_to_cpu(cifs_acl->access_entry_count);
                size = sizeof(struct cifs_posix_acl);
                size += sizeof(struct cifs_posix_ace) * count;
@@ -2621,7 +2621,7 @@ static int cifs_copy_posix_acl(char * trgt,char * src, const int buflen,
                count = le16_to_cpu(cifs_acl->default_entry_count);
                size += sizeof(struct cifs_posix_ace) * count;
                /* check if we would go beyond end of SMB */
-                if(size_of_data_area < size)
+                if (size_of_data_area < size)
                        return -EINVAL;
        } else {
                /* illegal type */
@@ -2629,9 +2629,9 @@ static int cifs_copy_posix_acl(char * trgt,char * src, const int buflen,
        }
        size = posix_acl_xattr_size(count);
-        if((buflen == 0) || (local_acl == NULL)) {
+        if ((buflen == 0) || (local_acl == NULL)) {
                /* used to query ACL EA size */                         
-        } else if(size > buflen) {
+        } else if (size > buflen) {
                return -ERANGE;
        } else /* buffer big enough */ {
                local_acl->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION);
@@ -2651,7 +2651,7 @@ static __u16 convert_ace_to_cifs_ace(struct cifs_posix_ace * cifs_ace,
        cifs_ace->cifs_e_perm = le16_to_cpu(local_ace->e_perm);
        cifs_ace->cifs_e_tag =  le16_to_cpu(local_ace->e_tag);
        /* BB is there a better way to handle the large uid? */
-        if(local_ace->e_id == cpu_to_le32(-1)) {
+        if (local_ace->e_id == cpu_to_le32(-1)) {
        /* Probably no need to le convert -1 on any arch but can not hurt */
                cifs_ace->cifs_uid = cpu_to_le64(-1);
        } else 
@@ -2670,21 +2670,21 @@ static __u16 ACL_to_cifs_posix(char * parm_data,const char * pACL,const int bufl
        int count;
        int i;
-        if((buflen == 0) || (pACL == NULL) || (cifs_acl == NULL))
+        if ((buflen == 0) || (pACL == NULL) || (cifs_acl == NULL))
                return 0;
        count = posix_acl_xattr_count((size_t)buflen);
        cFYI(1,("setting acl with %d entries from buf of length %d and version of %d",
                count, buflen, le32_to_cpu(local_acl->a_version)));
-        if(le32_to_cpu(local_acl->a_version) != 2) {
+        if (le32_to_cpu(local_acl->a_version) != 2) {
                cFYI(1,("unknown POSIX ACL version %d",
                     le32_to_cpu(local_acl->a_version)));
                return 0;
        }
        cifs_acl->version = cpu_to_le16(1);
-        if(acl_type == ACL_TYPE_ACCESS) 
+        if (acl_type == ACL_TYPE_ACCESS)
                cifs_acl->access_entry_count = cpu_to_le16(count);
-        else if(acl_type == ACL_TYPE_DEFAULT)
+        else if (acl_type == ACL_TYPE_DEFAULT)
                cifs_acl->default_entry_count = cpu_to_le16(count);
        else {
                cFYI(1,("unknown ACL type %d",acl_type));
@@ -2693,12 +2693,12 @@ static __u16 ACL_to_cifs_posix(char * parm_data,const char * pACL,const int bufl
        for(i=0;i<count;i++) {
                rc = convert_ace_to_cifs_ace(&cifs_acl->ace_array[i],
                                        &local_acl->a_entries[i]);
-                if(rc != 0) {
+                if (rc != 0) {
                        /* ACE not converted */
                        break;
                }
        }
-        if(rc == 0) {
+        if (rc == 0) {
                rc = (__u16)(count * sizeof(struct cifs_posix_ace));
                rc += sizeof(struct cifs_posix_acl);
                /* BB add check to make sure ACL does not overflow SMB */
@@ -2842,7 +2842,7 @@ setAclRetry:
        /* convert to on the wire format for POSIX ACL */
        data_count = ACL_to_cifs_posix(parm_data,local_acl,buflen,acl_type);
-        if(data_count == 0) {
+        if (data_count == 0) {
                rc = -EOPNOTSUPP;
                goto setACLerrorExit;
        }
@@ -2883,78 +2883,77 @@ CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
        int bytes_returned;
        __u16 params, byte_count;
-        cFYI(1,("In GetExtAttr"));
+        cFYI(1, ("In GetExtAttr"));
-        if(tcon == NULL)
+        if (tcon == NULL)
-                return -ENODEV;
+                return -ENODEV;
 GetExtAttrRetry:
-        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
+        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
-                      (void **) &pSMBr);
+                        (void **) &pSMBr);
-        if (rc)
+        if (rc)
-                return rc;
+                return rc;
-        params = 2 /* level */ +2 /* fid */;
+        params = 2 /* level */ +2 /* fid */;
-        pSMB->t2.TotalDataCount = 0;
+        pSMB->t2.TotalDataCount = 0;
-        pSMB->t2.MaxParameterCount = cpu_to_le16(4);
+        pSMB->t2.MaxParameterCount = cpu_to_le16(4);
-        /* BB find exact max data count below from sess structure BB */
+        /* BB find exact max data count below from sess structure BB */
-        pSMB->t2.MaxDataCount = cpu_to_le16(4000);
+        pSMB->t2.MaxDataCount = cpu_to_le16(4000);
-        pSMB->t2.MaxSetupCount = 0;
+        pSMB->t2.MaxSetupCount = 0;
-        pSMB->t2.Reserved = 0;
+        pSMB->t2.Reserved = 0;
-        pSMB->t2.Flags = 0;
+        pSMB->t2.Flags = 0;
-        pSMB->t2.Timeout = 0;
+        pSMB->t2.Timeout = 0;
-        pSMB->t2.Reserved2 = 0;
+        pSMB->t2.Reserved2 = 0;
-        pSMB->t2.ParameterOffset = cpu_to_le16(offsetof(struct smb_t2_qfi_req,
+        pSMB->t2.ParameterOffset = cpu_to_le16(offsetof(struct smb_t2_qfi_req,
-                        Fid) - 4);
+                                               Fid) - 4);
-        pSMB->t2.DataCount = 0;
+        pSMB->t2.DataCount = 0;
-        pSMB->t2.DataOffset = 0;
+        pSMB->t2.DataOffset = 0;
-        pSMB->t2.SetupCount = 1;
+        pSMB->t2.SetupCount = 1;
-        pSMB->t2.Reserved3 = 0;
+        pSMB->t2.Reserved3 = 0;
-        pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);
+        pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);
-        byte_count = params + 1 /* pad */ ;
+        byte_count = params + 1 /* pad */ ;
-        pSMB->t2.TotalParameterCount = cpu_to_le16(params);
+        pSMB->t2.TotalParameterCount = cpu_to_le16(params);
-        pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount;
+        pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount;
-        pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_ATTR_FLAGS);
+        pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_ATTR_FLAGS);
-        pSMB->Pad = 0;
+        pSMB->Pad = 0;
        pSMB->Fid = netfid;
-        pSMB->hdr.smb_buf_length += byte_count;
+        pSMB->hdr.smb_buf_length += byte_count;
-        pSMB->t2.ByteCount = cpu_to_le16(byte_count);
+        pSMB->t2.ByteCount = cpu_to_le16(byte_count);
-        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
+        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
-                (struct smb_hdr *) pSMBr, &bytes_returned, 0);
+                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        if (rc) {
+        if (rc) {
-                cFYI(1, ("error %d in GetExtAttr", rc));
+                cFYI(1, ("error %d in GetExtAttr", rc));
-        } else {
+        } else {
-                /* decode response */
+                /* decode response */
-                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
+                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
-                if (rc || (pSMBr->ByteCount < 2))
+                if (rc || (pSMBr->ByteCount < 2))
-                /* BB also check enough total bytes returned */
+                /* BB also check enough total bytes returned */
-                        /* If rc should we check for EOPNOSUPP and
+                        /* If rc should we check for EOPNOSUPP and
-                        disable the srvino flag? or in caller? */
+                           disable the srvino flag? or in caller? */
-                        rc = -EIO;      /* bad smb */
+                        rc = -EIO;      /* bad smb */
-                else {
+                else {
-                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
+                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
-                        __u16 count = le16_to_cpu(pSMBr->t2.DataCount);
+                        __u16 count = le16_to_cpu(pSMBr->t2.DataCount);
-                        struct file_chattr_info * pfinfo;
+                        struct file_chattr_info *pfinfo;
-                        /* BB Do we need a cast or hash here ? */
+                        /* BB Do we need a cast or hash here ? */
-                        if(count != 16) {
+                        if (count != 16) {
-                                cFYI(1, ("Illegal size ret in GetExtAttr"));
+                                cFYI(1, ("Illegal size ret in GetExtAttr"));
-                                rc = -EIO;
+                                rc = -EIO;
-                                goto GetExtAttrOut;
+                                goto GetExtAttrOut;
-                        }
+                        }
-                        pfinfo = (struct file_chattr_info *)
+                        pfinfo = (struct file_chattr_info *)
-                                (data_offset + (char *) &pSMBr->hdr.Protocol);
+                                 (data_offset + (char *) &pSMBr->hdr.Protocol);
-                        *pExtAttrBits = le64_to_cpu(pfinfo->mode);
+                        *pExtAttrBits = le64_to_cpu(pfinfo->mode);
                        *pMask = le64_to_cpu(pfinfo->mask);
-                }
+                }
-        }
+        }
 GetExtAttrOut:
-        cifs_buf_release(pSMB);
+        cifs_buf_release(pSMB);
-        if (rc == -EAGAIN)
+        if (rc == -EAGAIN)
-                goto GetExtAttrRetry;
+                goto GetExtAttrRetry;
-        return rc;
+        return rc;
 }
 #endif /* CONFIG_POSIX */
@@ -3017,7 +3016,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
                                        (char **)&psec_desc,
                                        &parm_len, &data_len);
                
-                if(rc)
+                if (rc)
                        goto qsec_out;
                pSMBr = (struct smb_com_ntransact_rsp *)iov[0].iov_base;
@@ -3031,14 +3030,14 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
 /* BB check that data area is minimum length and as big as acl_len */
                acl_len = le32_to_cpu(*(__le32 *)parm);
-                /* BB check if(acl_len > bufsize) */
+                /* BB check if (acl_len > bufsize) */
                parse_sec_desc(psec_desc, acl_len);
        }
 qsec_out:
-        if(buf_type == CIFS_SMALL_BUFFER)
+        if (buf_type == CIFS_SMALL_BUFFER)
                cifs_small_buf_release(iov[0].iov_base);
-        else if(buf_type == CIFS_LARGE_BUFFER)
+        else if (buf_type == CIFS_LARGE_BUFFER)
                cifs_buf_release(iov[0].iov_base);
 /*      cifs_small_buf_release(pSMB); */ /* Freed earlier now in SendReceive2 */
        return rc;
@@ -3167,7 +3166,7 @@ QPathInfoRetry:
        byte_count = params + 1 /* pad */ ;
        pSMB->TotalParameterCount = cpu_to_le16(params);
        pSMB->ParameterCount = pSMB->TotalParameterCount;
-        if(legacy)
+        if (legacy)
                pSMB->InformationLevel = cpu_to_le16(SMB_INFO_STANDARD);
        else
                pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_ALL_INFO);
@@ -3186,14 +3185,15 @@ QPathInfoRetry:
                        rc = -EIO;
                else if (!legacy && (pSMBr->ByteCount < 40)) 
                        rc = -EIO;      /* bad smb */
-                else if(legacy && (pSMBr->ByteCount < 24))
+                else if (legacy && (pSMBr->ByteCount < 24))
                        rc = -EIO;  /* 24 or 26 expected but we do not read last field */
                else if (pFindData){
                        int size;
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
-                        if(legacy) /* we do not read the last field, EAsize, fortunately
+                        if (legacy) /* we do not read the last field, EAsize,
-                                           since it varies by subdialect and on Set vs. Get, is  
+                                       fortunately since it varies by subdialect
-                                           two bytes or 4 bytes depending but we don't care here */
+                                       and on Set vs. Get, is two bytes or 4
+                                       bytes depending but we don't care here */
                                size = sizeof(FILE_INFO_STANDARD);
                        else
                                size = sizeof(FILE_ALL_INFO);
@@ -3416,7 +3416,7 @@ findFirstRetry:
        } else {        /* BB add check for overrun of SMB buf BB */
                name_len = strnlen(searchName, PATH_MAX);
 /* BB fix here and in unicode clause above ie
-                if(name_len > buffersize-header)
+                if (name_len > buffersize-header)
                        free buffer exit; BB */
                strncpy(pSMB->FileName, searchName, name_len);
                pSMB->FileName[name_len] = dirsep;
@@ -3477,7 +3477,7 @@ findFirstRetry:
        } else { /* decode response */
                /* BB remember to free buffer if error BB */
                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
-                if(rc == 0) {
+                if (rc == 0) {
                        if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)
                                psrch_inf->unicode = TRUE;
                        else
@@ -3491,7 +3491,7 @@ findFirstRetry:
                        parms = (T2_FFIRST_RSP_PARMS *)((char *) &pSMBr->hdr.Protocol +
                               le16_to_cpu(pSMBr->t2.ParameterOffset));
-                        if(parms->EndofSearch)
+                        if (parms->EndofSearch)
                                psrch_inf->endOfSearch = TRUE;
                        else
                                psrch_inf->endOfSearch = FALSE;
@@ -3521,7 +3521,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        cFYI(1, ("In FindNext"));
-        if(psrch_inf->endOfSearch == TRUE)
+        if (psrch_inf->endOfSearch == TRUE)
                return -ENOENT;
        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
@@ -3566,7 +3566,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        name_len = psrch_inf->resume_name_len;
        params += name_len;
-        if(name_len < PATH_MAX) {
+        if (name_len < PATH_MAX) {
                memcpy(pSMB->ResumeFileName, psrch_inf->presume_name, name_len);
                byte_count += name_len;
                /* 14 byte parm len above enough for 2 byte null terminator */
@@ -3594,7 +3594,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        } else {                /* decode response */
                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
                
-                if(rc == 0) {
+                if (rc == 0) {
                        /* BB fixme add lock for file (srch_info) struct here */
                        if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)
                                psrch_inf->unicode = TRUE;
@@ -3605,7 +3605,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
                        parms = (T2_FNEXT_RSP_PARMS *)response_data;
                        response_data = (char *)&pSMBr->hdr.Protocol +
                                le16_to_cpu(pSMBr->t2.DataOffset);
-                        if(psrch_inf->smallBuf)
+                        if (psrch_inf->smallBuf)
                                cifs_small_buf_release(
                                        psrch_inf->ntwrk_buf_start);
                        else
@@ -3613,7 +3613,7 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
                        psrch_inf->srch_entries_start = response_data;
                        psrch_inf->ntwrk_buf_start = (char *)pSMB;
                        psrch_inf->smallBuf = 0;
-                        if(parms->EndofSearch)
+                        if (parms->EndofSearch)
                                psrch_inf->endOfSearch = TRUE;
                        else
                                psrch_inf->endOfSearch = FALSE;
@@ -3653,7 +3653,7 @@ CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle
        /* no sense returning error if session restarted
                as file handle has been closed */
-        if(rc == -EAGAIN)
+        if (rc == -EAGAIN)
                return 0;
        if (rc)
                return rc;
@@ -3689,7 +3689,7 @@ CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
        __u16 params, byte_count;
        cFYI(1,("In GetSrvInodeNum for %s",searchName));
-        if(tcon == NULL)
+        if (tcon == NULL)
                return -ENODEV; 
 GetInodeNumberRetry:
@@ -3753,7 +3753,7 @@ GetInodeNumberRetry:
                        __u16 count = le16_to_cpu(pSMBr->t2.DataCount);
                        struct file_internal_info * pfinfo;
                        /* BB Do we need a cast or hash here ? */
-                        if(count < 8) {
+                        if (count < 8) {
                                cFYI(1, ("Illegal size ret in QryIntrnlInf"));
                                rc = -EIO;
                                goto GetInodeNumOut;
@@ -3824,8 +3824,8 @@ getDFSRetry:
                strncpy(pSMB->RequestFileName, searchName, name_len);
        }
-        if(ses->server) {
+        if (ses->server) {
-                if(ses->server->secMode &
+                if (ses->server->secMode &
                   (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                        pSMB->hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
        }
@@ -3885,7 +3885,7 @@ getDFSRetry:
                        *number_of_UNC_in_array = le16_to_cpu(pSMBr->NumberOfReferrals);
                        /* BB Fix below so can return more than one referral */
-                        if(*number_of_UNC_in_array > 1)
+                        if (*number_of_UNC_in_array > 1)
                                *number_of_UNC_in_array = 1;
                        /* get the length of the strings describing refs */
@@ -3913,7 +3913,7 @@ getDFSRetry:
                        /* BB add check for name_len bigger than bcc */
                        *targetUNCs = 
                                kmalloc(name_len+1+ (*number_of_UNC_in_array),GFP_KERNEL);
-                        if(*targetUNCs == NULL) {
+                        if (*targetUNCs == NULL) {
                                rc = -ENOMEM;
                                goto GetDFSRefExit;
                        }
@@ -4458,16 +4458,16 @@ QFSPosixRetry:
                                        le64_to_cpu(response_data->TotalBlocks);
                        FSData->f_bfree =
                            le64_to_cpu(response_data->BlocksAvail);
-                        if(response_data->UserBlocksAvail == cpu_to_le64(-1)) {
+                        if (response_data->UserBlocksAvail == cpu_to_le64(-1)) {
                                FSData->f_bavail = FSData->f_bfree;
                        } else {
                                FSData->f_bavail =
                                        le64_to_cpu(response_data->UserBlocksAvail);
                        }
-                        if(response_data->TotalFileNodes != cpu_to_le64(-1))
+                        if (response_data->TotalFileNodes != cpu_to_le64(-1))
                                FSData->f_files =
                                        le64_to_cpu(response_data->TotalFileNodes);
-                        if(response_data->FreeFileNodes != cpu_to_le64(-1))
+                        if (response_data->FreeFileNodes != cpu_to_le64(-1))
                                FSData->f_ffree =
                                        le64_to_cpu(response_data->FreeFileNodes);
                }
@@ -4530,7 +4530,7 @@ SetEOFRetry:
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
                                     InformationLevel) - 4;
        offset = param_offset + params;
-        if(SetAllocation) {
+        if (SetAllocation) {
                if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
                    pSMB->InformationLevel =
                        cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2);
@@ -4630,7 +4630,7 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
        pSMB->DataOffset = cpu_to_le16(offset);
        parm_data->FileSize = cpu_to_le64(size);
        pSMB->Fid = fid;
-        if(SetAllocation) {
+        if (SetAllocation) {
                if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
                        pSMB->InformationLevel =
                                cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2);
@@ -4955,19 +4955,19 @@ setPermsRetry:
        data_offset->DevMinor = cpu_to_le64(MINOR(device));
        data_offset->Permissions = cpu_to_le64(mode);
    
-        if(S_ISREG(mode))
+        if (S_ISREG(mode))
                data_offset->Type = cpu_to_le32(UNIX_FILE);
-        else if(S_ISDIR(mode))
+        else if (S_ISDIR(mode))
                data_offset->Type = cpu_to_le32(UNIX_DIR);
-        else if(S_ISLNK(mode))
+        else if (S_ISLNK(mode))
                data_offset->Type = cpu_to_le32(UNIX_SYMLINK);
-        else if(S_ISCHR(mode))
+        else if (S_ISCHR(mode))
                data_offset->Type = cpu_to_le32(UNIX_CHARDEV);
-        else if(S_ISBLK(mode))
+        else if (S_ISBLK(mode))
                data_offset->Type = cpu_to_le32(UNIX_BLOCKDEV);
-        else if(S_ISFIFO(mode))
+        else if (S_ISFIFO(mode))
                data_offset->Type = cpu_to_le32(UNIX_FIFO);
-        else if(S_ISSOCK(mode))
+        else if (S_ISSOCK(mode))
                data_offset->Type = cpu_to_le32(UNIX_SOCKET);
@@ -5019,7 +5019,7 @@ int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
        pSMB->SetupCount = 4; /* single byte does not need le conversion */
        pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_NOTIFY_CHANGE);
        pSMB->ParameterCount = pSMB->TotalParameterCount;
-        if(notify_subdirs)
+        if (notify_subdirs)
                pSMB->WatchTree = 1; /* one byte - no le conversion needed */
        pSMB->Reserved2 = 0;
        pSMB->CompletionFilter = cpu_to_le32(filter);
@@ -5036,7 +5036,7 @@ int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
                dnotify_req = kmalloc(
                                                sizeof(struct dir_notify_req),
                                                 GFP_KERNEL);
-                if(dnotify_req) {
+                if (dnotify_req) {
                        dnotify_req->Pid = pSMB->hdr.Pid;
                        dnotify_req->PidHigh = pSMB->hdr.PidHigh;
                        dnotify_req->Mid = pSMB->hdr.Mid;
@@ -5142,13 +5142,13 @@ QAllEAsRetry:
                        struct fealist * ea_response_data;
                        rc = 0;
                        /* validate_trans2_offsets() */
-                        /* BB to check if(start of smb + data_offset > &bcc+ bcc)*/
+                        /* BB check if start of smb + data_offset > &bcc+ bcc */
                        ea_response_data = (struct fealist *)
                                (((char *) &pSMBr->hdr.Protocol) +
                                data_offset);
                        name_len = le32_to_cpu(ea_response_data->list_len);
                        cFYI(1,("ea length %d", name_len));
-                        if(name_len <= 8) {
+                        if (name_len <= 8) {
                        /* returned EA size zeroed at top of function */
                                cFYI(1,("empty EA list returned from server"));
                        } else {
@@ -5162,8 +5162,8 @@ QAllEAsRetry:
                                        temp_ptr += 4;
                                        rc += temp_fea->name_len;
                                /* account for prefix user. and trailing null */
-                                        rc = rc + 5 + 1; 
+                                        rc = rc + 5 + 1;
-                                        if(rc<(int)buf_size) {
+                                        if (rc < (int)buf_size) {
                                                memcpy(EAData,"user.",5);
                                                EAData+=5;
                                                memcpy(EAData,temp_ptr,temp_fea->name_len);
@@ -5171,7 +5171,7 @@ QAllEAsRetry:
                                                /* null terminate name */
                                                *EAData = 0;
                                                EAData = EAData + 1;
-                                        } else if(buf_size == 0) {
+                                        } else if (buf_size == 0) {
                                                /* skip copy - calc size only */
                                        } else {
                                                /* stop before overrun buffer */
@@ -5285,13 +5285,13 @@ QEARetry:
                        struct fealist * ea_response_data;
                        rc = -ENODATA;
                        /* validate_trans2_offsets() */
-                        /* BB to check if(start of smb + data_offset > &bcc+ bcc)*/
+                        /* BB check if start of smb + data_offset > &bcc+ bcc*/
                        ea_response_data = (struct fealist *)
                                (((char *) &pSMBr->hdr.Protocol) +
                                data_offset);
                        name_len = le32_to_cpu(ea_response_data->list_len);
                        cFYI(1,("ea length %d", name_len));
-                        if(name_len <= 8) {
+                        if (name_len <= 8) {
                        /* returned EA size zeroed at top of function */
                                cFYI(1,("empty EA list returned from server"));
                        } else {
@@ -5308,18 +5308,18 @@ QEARetry:
                                        value_len = le16_to_cpu(temp_fea->value_len);
                                /* BB validate that value_len falls within SMB, 
                                even though maximum for name_len is 255 */ 
-                                        if(memcmp(temp_fea->name,ea_name,
+                                        if (memcmp(temp_fea->name, ea_name,
                                                  temp_fea->name_len) == 0) {
                                                /* found a match */
                                                rc = value_len;
                                /* account for prefix user. and trailing null */
-                                                if(rc<=(int)buf_size) {
+                                                if (rc <= (int)buf_size) {
                                                        memcpy(ea_value,
                                                                temp_fea->name+temp_fea->name_len+1,
                                                                rc);
                                                        /* ea values, unlike ea names,
                                                        are not null terminated */
-                                                } else if(buf_size == 0) {
+                                                } else if (buf_size == 0) {
                                                /* skip copy - calc size only */
                                                } else {
                                                        /* stop before overrun buffer */
@@ -5387,7 +5387,7 @@ SetEARetry:
        /* done calculating parms using name_len of file name,
        now use name_len to calculate length of ea name
        we are going to create in the inode xattrs */
-        if(ea_name == NULL)
+        if (ea_name == NULL)
                name_len = 0;
        else
                name_len = strnlen(ea_name,255);
@@ -5421,7 +5421,7 @@ SetEARetry:
        /* we checked above that name len is less than 255 */
        parm_data->list[0].name_len = (__u8)name_len;
        /* EA names are always ASCII */
-        if(ea_name)
+        if (ea_name)
                strncpy(parm_data->list[0].name,ea_name,name_len);
        parm_data->list[0].name[name_len] = 0;
        parm_data->list[0].value_len = cpu_to_le16(ea_value_len);
@@ -5429,8 +5429,8 @@ SetEARetry:
        we need to ensure that it fits within the smb */
        /*BB add length check that it would fit in negotiated SMB buffer size BB */
-        /* if(ea_value_len > buffer_size - 512 (enough for header)) */
+        /* if (ea_value_len > buffer_size - 512 (enough for header)) */
-        if(ea_value_len)
+        if (ea_value_len)
                memcpy(parm_data->list[0].name+name_len+1,ea_value,ea_value_len);
        pSMB->TotalDataCount = pSMB->DataCount;
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 19cc294c7c70..0211e0651b50 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -1,7 +1,7 @@
 /*
 *   fs/cifs/misc.c
 *
- *   Copyright (C) International Business Machines  Corp., 2002,2005
+ *   Copyright (C) International Business Machines  Corp., 2002,2007
 *   Author(s): Steve French (sfrench@us.ibm.com)
 *
 *   This library is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ _GetXid(void)
        GlobalTotalActiveXid++;
        if (GlobalTotalActiveXid > GlobalMaxActiveXid)
                GlobalMaxActiveXid = GlobalTotalActiveXid;      /* keep high water mark for number of simultaneous vfs ops in our filesystem */
-        if(GlobalTotalActiveXid > 65000)
+        if (GlobalTotalActiveXid > 65000)
                cFYI(1,("warning: more than 65000 requests active"));
        xid = GlobalCurrentXid++;
        spin_unlock(&GlobalMid_Lock);
@@ -60,7 +60,7 @@ void
 _FreeXid(unsigned int xid)
 {
        spin_lock(&GlobalMid_Lock);
-        /* if(GlobalTotalActiveXid == 0)
+        /* if (GlobalTotalActiveXid == 0)
                BUG(); */
        GlobalTotalActiveXid--;
        spin_unlock(&GlobalMid_Lock);
@@ -242,7 +242,7 @@ __u16 GetNextMid(struct TCP_Server_Info *server)
        __u16 last_mid;
        int   collision;  
-        if(server == NULL)
+        if (server == NULL)
                return mid;
        spin_lock(&GlobalMid_Lock);
@@ -260,7 +260,7 @@ __u16 GetNextMid(struct TCP_Server_Info *server)
                struct mid_q_entry *mid_entry;
                collision = 0;
-                if(server->CurrentMid == 0)
+                if (server->CurrentMid == 0)
                        server->CurrentMid++;
                list_for_each(tmp, &server->pending_mid_q) {
@@ -273,7 +273,7 @@ __u16 GetNextMid(struct TCP_Server_Info *server)
                                break;
                        }
                }
-                if(collision == 0) {
+                if (collision == 0) {
                        mid = server->CurrentMid;
                        break;
                }
@@ -325,7 +325,7 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
                        /* Uid is not converted */
                        buffer->Uid = treeCon->ses->Suid;
                        buffer->Mid = GetNextMid(treeCon->ses->server);
-                        if(multiuser_mount != 0) {
+                        if (multiuser_mount != 0) {
                /* For the multiuser case, there are few obvious technically  */
                /* possible mechanisms to match the local linux user (uid)    */
                /* to a valid remote smb user (smb_uid):                      */
@@ -350,13 +350,13 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
                /*  BB Add support for establishing new tCon and SMB Session  */
                /*      with userid/password pairs found on the smb session   */ 
                /*      for other target tcp/ip addresses               BB    */
-                                if(current->fsuid != treeCon->ses->linux_uid) {
+                                if (current->fsuid != treeCon->ses->linux_uid) {
                                        cFYI(1,("Multiuser mode and UID did not match tcon uid"));
                                        read_lock(&GlobalSMBSeslock);
                                        list_for_each(temp_item, &GlobalSMBSessionList) {
                                                ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
-                                                if(ses->linux_uid == current->fsuid) {
+                                                if (ses->linux_uid == current->fsuid) {
-                                                        if(ses->server == treeCon->ses->server) {
+                                                        if (ses->server == treeCon->ses->server) {
                                                                cFYI(1,("found matching uid substitute right smb_uid"));  
                                                                buffer->Uid = ses->Suid;
                                                                break;
@@ -374,8 +374,8 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
                        buffer->Flags2 |= SMBFLG2_DFS;
                if (treeCon->nocase)
                        buffer->Flags  |= SMBFLG_CASELESS;
-                if((treeCon->ses) && (treeCon->ses->server))
+                if ((treeCon->ses) && (treeCon->ses->server))
-                        if(treeCon->ses->server->secMode & 
+                        if (treeCon->ses->server->secMode &
                          (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                                buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
        }
@@ -392,11 +392,11 @@ checkSMBhdr(struct smb_hdr *smb, __u16 mid)
           and that the message ids match */
        if ((*(__le32 *) smb->Protocol == cpu_to_le32(0x424d53ff)) && 
                (mid == smb->Mid)) {    
-                if(smb->Flags & SMBFLG_RESPONSE)
+                if (smb->Flags & SMBFLG_RESPONSE)
                        return 0;                    
                else {        
                /* only one valid case where server sends us request */
-                        if(smb->Command == SMB_COM_LOCKING_ANDX)
+                        if (smb->Command == SMB_COM_LOCKING_ANDX)
                                return 0;
                        else
                                cERROR(1, ("Rcvd Request not response"));         
@@ -458,16 +458,16 @@ checkSMB(struct smb_hdr *smb, __u16 mid, unsigned int length)
                return 1;
        clc_len = smbCalcSize_LE(smb);
-        if(4 + len != length) {
+        if (4 + len != length) {
                cERROR(1, ("Length read does not match RFC1001 length %d",len));
                return 1;
        }
        if (4 + len != clc_len) {
                /* check if bcc wrapped around for large read responses */
-                if((len > 64 * 1024) && (len > clc_len)) {
+                if ((len > 64 * 1024) && (len > clc_len)) {
                        /* check if lengths match mod 64K */
-                        if(((4 + len) & 0xFFFF) == (clc_len & 0xFFFF))
+                        if (((4 + len) & 0xFFFF) == (clc_len & 0xFFFF))
                                return 0; /* bcc wrapped */                     
                }
                cFYI(1, ("Calculated size %d vs length %d mismatch for mid %d",
@@ -483,7 +483,7 @@ checkSMB(struct smb_hdr *smb, __u16 mid, unsigned int length)
                but server says length is 0x21 bytes too long as if the server
                forget to reset the smb rfc1001 length when it reset the
                wct and bcc to minimum size and drop the t2 parms and data */
-                if((4+len > clc_len) && (len <= clc_len + 512))
+                if ((4+len > clc_len) && (len <= clc_len + 512))
                        return 0;
                else {
                        cERROR(1, ("RFC1001 size %d bigger than SMB for Mid=%d",
@@ -503,13 +503,13 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
        struct cifsFileInfo *netfile;
        cFYI(1,("Checking for oplock break or dnotify response"));
-        if((pSMB->hdr.Command == SMB_COM_NT_TRANSACT) &&
+        if ((pSMB->hdr.Command == SMB_COM_NT_TRANSACT) &&
           (pSMB->hdr.Flags & SMBFLG_RESPONSE)) {
                struct smb_com_transaction_change_notify_rsp * pSMBr =
                        (struct smb_com_transaction_change_notify_rsp *)buf;
                struct file_notify_information * pnotify;
                __u32 data_offset = 0;
-                if(pSMBr->ByteCount > sizeof(struct file_notify_information)) {
+                if (pSMBr->ByteCount > sizeof(struct file_notify_information)) {
                        data_offset = le32_to_cpu(pSMBr->DataOffset);
                        pnotify = (struct file_notify_information *)
@@ -520,15 +520,15 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                                sizeof(struct smb_hdr)+60); */
                        return TRUE;
                }
-                if(pSMBr->hdr.Status.CifsError) {
+                if (pSMBr->hdr.Status.CifsError) {
                        cFYI(1,("notify err 0x%d",pSMBr->hdr.Status.CifsError));
                        return TRUE;
                }
                return FALSE;
        }  
-        if(pSMB->hdr.Command != SMB_COM_LOCKING_ANDX)
+        if (pSMB->hdr.Command != SMB_COM_LOCKING_ANDX)
                return FALSE;
-        if(pSMB->hdr.Flags & SMBFLG_RESPONSE) {
+        if (pSMB->hdr.Flags & SMBFLG_RESPONSE) {
                /* no sense logging error on invalid handle on oplock
                   break - harmless race between close request and oplock
                   break response is expected from time to time writing out
@@ -544,11 +544,11 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                        return FALSE; /* on valid oplock brk we get "request" */
                }
        }
-        if(pSMB->hdr.WordCount != 8)
+        if (pSMB->hdr.WordCount != 8)
                return FALSE;
        cFYI(1,(" oplock type 0x%d level 0x%d",pSMB->LockType,pSMB->OplockLevel));
-        if(!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE))
+        if (!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE))
                return FALSE;    
        /* look up tcon based on tid & uid */
@@ -560,14 +560,14 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                        list_for_each(tmp1,&tcon->openFileList){
                                netfile = list_entry(tmp1,struct cifsFileInfo,
                                                     tlist);
-                                if(pSMB->Fid == netfile->netfid) {
+                                if (pSMB->Fid == netfile->netfid) {
                                        struct cifsInodeInfo *pCifsInode;
                                        read_unlock(&GlobalSMBSeslock);
                                        cFYI(1,("file id match, oplock break"));
                                        pCifsInode = 
                                                CIFS_I(netfile->pInode);
                                        pCifsInode->clientCanCacheAll = FALSE;
-                                        if(pSMB->OplockLevel == 0)
+                                        if (pSMB->OplockLevel == 0)
                                                pCifsInode->clientCanCacheRead
                                                        = FALSE;
                                        pCifsInode->oplockPending = TRUE;
@@ -575,7 +575,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                                                          netfile->netfid,
                                                          tcon);
                                        cFYI(1,("about to wake up oplock thd"));
-                                        if(oplockThread)
+                                        if (oplockThread)
                                            wake_up_process(oplockThread);
                                        return TRUE;
                                }
@@ -681,7 +681,7 @@ cifs_convertUCSpath(char *target, const __le16 * source, int maxlen,
                        default: 
                                len = cp->uni2char(src_char, &target[j], 
                                                NLS_MAX_CHARSET_SIZE);
-                                if(len > 0) {
+                                if (len > 0) {
                                        j += len;
                                        continue;
                                } else {
@@ -690,7 +690,7 @@ cifs_convertUCSpath(char *target, const __le16 * source, int maxlen,
                }
                j++;
                /* make sure we do not overrun callers allocated temp buffer */
-                if(j >= (2 * NAME_MAX))
+                if (j >= (2 * NAME_MAX))
                        break;
        }
 cUCS_out:
@@ -711,7 +711,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
        char src_char;
        __u16 temp;
-        if(!mapChars) 
+        if (!mapChars)
                return cifs_strtoUCS(target, source, PATH_MAX, cp);
        for(i = 0, j = 0; i < maxlen; j++) {
@@ -749,7 +749,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen,
                                        len_remaining, &temp);
                                /* if no match, use question mark, which
                                at least in some cases servers as wild card */
-                                if(charlen < 1) {
+                                if (charlen < 1) {
                                        target[j] = cpu_to_le16(0x003f);
                                        charlen = 1;
                                } else
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index b388c356fde0..20a3fe7cbd7b 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -140,9 +140,9 @@ cifs_inet_pton(int address_family, char *cp,void *dst)
        /* calculate length by finding first slash or NULL */
        /* BB Should we convert '/' slash to '\' here since it seems already done
           before this */
-        if( address_family == AF_INET ){
+        if ( address_family == AF_INET ) {
                ret = in4_pton(cp, -1 /* len */, dst , '\\', NULL);     
-        } else if( address_family == AF_INET6 ){
+        } else if ( address_family == AF_INET6 ) {
                ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL);
        }
 #ifdef CONFIG_CIFS_DEBUG2
@@ -773,7 +773,7 @@ map_smb_to_linux_error(struct smb_hdr *smb)
        if (smb->Flags2 & SMBFLG2_ERR_STATUS) {
                /* translate the newer STATUS codes to old style errors and then to POSIX errors */
                __u32 err = le32_to_cpu(smb->Status.CifsError);
-                if(cifsFYI & CIFS_RC)
+                if (cifsFYI & CIFS_RC)
                        cifs_print_status(err);
                ntstatus_to_dos(err, &smberrclass, &smberrcode);
        } else {
@@ -889,15 +889,15 @@ struct timespec cnvrtDosUnixTm(__u16 date, __u16 time)
        sec = 2 * st->TwoSeconds;
        min = st->Minutes;
-        if((sec > 59) || (min > 59))
+        if ((sec > 59) || (min > 59))
                cERROR(1,("illegal time min %d sec %d", min, sec));
        sec += (min * 60);
        sec += 60 * 60 * st->Hours;
-        if(st->Hours > 24)
+        if (st->Hours > 24)
                cERROR(1,("illegal hours %d",st->Hours));
        days = sd->Day;
        month = sd->Month;
-        if((days > 31) || (month > 12))
+        if ((days > 31) || (month > 12))
                cERROR(1,("illegal date, month %d day: %d", month, days));
        month -= 1;
        days += total_days_of_prev_months[month];
@@ -911,13 +911,13 @@ struct timespec cnvrtDosUnixTm(__u16 date, __u16 time)
         consider 2 special case years, ie the years 2000 and 2100, and only
         adjust for the lack of leap year for the year 2100, as 2000 was a 
         leap year (divisable by 400) */
-        if(year >= 120)  /* the year 2100 */
+        if (year >= 120)  /* the year 2100 */
                days = days - 1;  /* do not count leap year for the year 2100 */
        /* adjust for leap year where we are still before leap day */
-        if(year != 120)
+        if (year != 120)
                days -= ((year & 0x03) == 0) && (month < 2 ? 1 : 0);
-        sec += 24 * 60 * 60 * days; 
+        sec += 24 * 60 * 60 * days;
        ts.tv_sec = sec;
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 52e657ec1f18..19c8be4696f9 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -110,7 +110,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
        return rc;
 }
-static void AdjustForTZ(struct cifsTconInfo * tcon, struct inode * inode)
+static void AdjustForTZ(struct cifsTconInfo *tcon, struct inode *inode)
 {
        if ((tcon) && (tcon->ses) && (tcon->ses->server)) {
                inode->i_ctime.tv_sec += tcon->ses->server->timeAdj;
@@ -122,7 +122,7 @@ static void AdjustForTZ(struct cifsTconInfo * tcon, struct inode * inode)
 static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
-                char * buf, int *pobject_type, int isNewInode)
+                          char *buf, int *pobject_type, int isNewInode)
 {
        loff_t local_size;
        struct timespec local_mtime;
@@ -151,7 +151,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                      cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime));
        } else { /* legacy, OS2 and DOS style */
 /*              struct timespec ts;*/
-                FIND_FILE_STANDARD_INFO * pfindData = 
+                FIND_FILE_STANDARD_INFO * pfindData =
                        (FIND_FILE_STANDARD_INFO *)buf;
                tmp_inode->i_mtime = cnvrtDosUnixTm(
@@ -176,7 +176,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
        /* treat dos attribute of read-only as read-only mode bit e.g. 555? */
        /* 2767 perms - indicate mandatory locking */
-                /* BB fill in uid and gid here? with help from winbind? 
+                /* BB fill in uid and gid here? with help from winbind?
                   or retrieve from NTFS stream extended attribute */
        if (atomic_read(&cifsInfo->inUse) == 0) {
                tmp_inode->i_uid = cifs_sb->mnt_uid;
@@ -197,7 +197,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                        tmp_inode->i_mode = cifs_sb->mnt_dir_mode;
                }
                tmp_inode->i_mode |= S_IFDIR;
-        } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && 
+        } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) &&
                   (attr & ATTR_SYSTEM)) {
                if (end_of_file == 0)  {
                        *pobject_type = DT_FIFO;
@@ -207,13 +207,13 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                        inode as needing revalidate and get the real type
                        (blk vs chr vs. symlink) later ie in lookup */
                        *pobject_type = DT_REG;
-                        tmp_inode->i_mode |= S_IFREG; 
+                        tmp_inode->i_mode |= S_IFREG;
-                        cifsInfo->time = 0;     
+                        cifsInfo->time = 0;
                }
 /* we no longer mark these because we could not follow them */
 /*        } else if (attr & ATTR_REPARSE) {
-                *pobject_type = DT_LNK;
+                *pobject_type = DT_LNK;
-                tmp_inode->i_mode |= S_IFLNK; */
+                tmp_inode->i_mode |= S_IFLNK; */
        } else {
                *pobject_type = DT_REG;
                tmp_inode->i_mode |= S_IFREG;
@@ -221,7 +221,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                        tmp_inode->i_mode &= ~(S_IWUGO);
                else if ((tmp_inode->i_mode & S_IWUGO) == 0)
                        /* the ATTR_READONLY flag may have been changed on   */
-                        /* server -- set any w bits allowed by mnt_file_mode */
+                        /* server -- set any w bits allowed by mnt_file_mode */
                        tmp_inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode);
        } /* could add code here - to validate if device or weird share type? */
@@ -232,7 +232,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
        spin_lock(&tmp_inode->i_lock);
        if (is_size_safe_to_change(cifsInfo, end_of_file)) {
-                /* can not safely change the file size here if the 
+                /* can not safely change the file size here if the
                client is writing to it due to potential races */
                i_size_write(tmp_inode, end_of_file);
@@ -323,8 +323,8 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
        tmp_inode->i_mode = le64_to_cpu(pfindData->Permissions);
        /* since we set the inode type below we need to mask off type
-           to avoid strange results if bits above were corrupt */
+           to avoid strange results if bits above were corrupt */
-        tmp_inode->i_mode &= ~S_IFMT;
+        tmp_inode->i_mode &= ~S_IFMT;
        if (type == UNIX_FILE) {
                *pobject_type = DT_REG;
                tmp_inode->i_mode |= S_IFREG;
@@ -354,7 +354,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                /* safest to just call it a file */
                *pobject_type = DT_REG;
                tmp_inode->i_mode |= S_IFREG;
-                cFYI(1,("unknown inode type %d",type)); 
+                cFYI(1, ("unknown inode type %d", type));
        }
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
@@ -369,7 +369,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
        spin_lock(&tmp_inode->i_lock);
        if (is_size_safe_to_change(cifsInfo, end_of_file)) {
-                /* can not safely change the file size here if the 
+                /* can not safely change the file size here if the
                client is writing to it due to potential races */
                i_size_write(tmp_inode, end_of_file);
@@ -394,15 +394,16 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                        tmp_inode->i_fop = &cifs_file_ops;
                if ((cifs_sb->tcon) && (cifs_sb->tcon->ses) &&
-                   (cifs_sb->tcon->ses->server->maxBuf < 
+                   (cifs_sb->tcon->ses->server->maxBuf <
                        PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE))
                        tmp_inode->i_data.a_ops = &cifs_addr_ops_smallbuf;
                else
                        tmp_inode->i_data.a_ops = &cifs_addr_ops;
                if (isNewInode)
-                        return; /* No sense invalidating pages for new inode since we
+                        return; /* No sense invalidating pages for new inode
-                                           have not started caching readahead file data yet */
+                                   since we have not started caching readahead
+                                   file data for it yet */
                if (timespec_equal(&tmp_inode->i_mtime, &local_mtime) &&
                        (local_size == tmp_inode->i_size)) {
@@ -421,7 +422,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                tmp_inode->i_op = &cifs_symlink_inode_ops;
 /* tmp_inode->i_fop = *//* do not need to set to anything */
        } else {
-                cFYI(1, ("Special inode")); 
+                cFYI(1, ("Special inode"));
                init_special_inode(tmp_inode, tmp_inode->i_mode,
                                   tmp_inode->i_rdev);
        }
@@ -500,7 +501,7 @@ static int cifs_unicode_bytelen(char *str)
                if (ustr[len] == 0)
                        return len << 1;
        }
-        cFYI(1,("Unicode string longer than PATH_MAX found"));
+        cFYI(1, ("Unicode string longer than PATH_MAX found"));
        return len << 1;
 }
@@ -517,7 +518,7 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)
                                pfData->FileNameLength;
        } else
                new_entry = old_entry + le32_to_cpu(pDirInfo->NextEntryOffset);
-        cFYI(1,("new entry %p old entry %p",new_entry,old_entry));
+        cFYI(1, ("new entry %p old entry %p", new_entry, old_entry));
        /* validate that new_entry is not past end of SMB */
        if (new_entry >= end_of_smb) {
                cERROR(1,
@@ -583,7 +584,8 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
                filename = &pFindData->FileName[0];
                len = pFindData->FileNameLength;
        } else {
-                cFYI(1,("Unknown findfirst level %d",cfile->srch_inf.info_level));
+                cFYI(1, ("Unknown findfirst level %d",
+                         cfile->srch_inf.info_level));
        }
        if (filename) {
@@ -604,7 +606,7 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
                                if (filename[0] == '.') 
                                        rc = 1;
                        } else if (len == 2) {
-                                if((filename[0] == '.') && (filename[1] == '.'))
+                                if ((filename[0] == '.') && (filename[1] == '.'))
                                        rc = 2;
                        }
                }
@@ -665,13 +667,13 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
             is_dir_changed(file)) || 
           (index_to_find < first_entry_in_buffer)) {
                /* close and restart search */
-                cFYI(1,("search backing up - close and restart search"));
+                cFYI(1, ("search backing up - close and restart search"));
                cifsFile->invalidHandle = TRUE;
                CIFSFindClose(xid, pTcon, cifsFile->netfid);
                kfree(cifsFile->search_resume_name);
                cifsFile->search_resume_name = NULL;
                if (cifsFile->srch_inf.ntwrk_buf_start) {
-                        cFYI(1,("freeing SMB ff cache buf on search rewind"));
+                        cFYI(1, ("freeing SMB ff cache buf on search rewind"));
                        if (cifsFile->srch_inf.smallBuf)
                                cifs_small_buf_release(cifsFile->srch_inf.
                                                ntwrk_buf_start);
@@ -681,14 +683,15 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                }
                rc = initiate_cifs_search(xid,file);
                if (rc) {
-                        cFYI(1,("error %d reinitiating a search on rewind",rc));
+                        cFYI(1, ("error %d reinitiating a search on rewind",
+                                 rc));
                        return rc;
                }
        }
        while((index_to_find >= cifsFile->srch_inf.index_of_last_entry) && 
              (rc == 0) && (cifsFile->srch_inf.endOfSearch == FALSE)){
-                cFYI(1,("calling findnext2"));
+                cFYI(1, ("calling findnext2"));
                rc = CIFSFindNext(xid,pTcon,cifsFile->netfid, 
                                  &cifsFile->srch_inf);
                if (rc)
@@ -707,14 +710,14 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                first_entry_in_buffer = cifsFile->srch_inf.index_of_last_entry
                                        - cifsFile->srch_inf.entries_in_buffer;
                pos_in_buf = index_to_find - first_entry_in_buffer;
-                cFYI(1,("found entry - pos_in_buf %d",pos_in_buf));
+                cFYI(1, ("found entry - pos_in_buf %d", pos_in_buf));
                for(i=0;(i<(pos_in_buf)) && (current_entry != NULL);i++) {
                        /* go entry by entry figuring out which is first */
                        current_entry = nxt_dir_entry(current_entry,end_of_smb,
                                                cifsFile->srch_inf.info_level);
                }
-                if((current_entry == NULL) && (i < pos_in_buf)) {
+                if ((current_entry == NULL) && (i < pos_in_buf)) {
                        /* BB fixme - check if we should flag this error */
                        cERROR(1,("reached end of buf searching for pos in buf"
                          " %d index to find %lld rc %d",
@@ -723,12 +726,12 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                rc = 0;
                *ppCurrentEntry = current_entry;
        } else {
-                cFYI(1,("index not in buffer - could not findnext into it"));
+                cFYI(1, ("index not in buffer - could not findnext into it"));
                return 0;
        }
-        if(pos_in_buf >= cifsFile->srch_inf.entries_in_buffer) {
+        if (pos_in_buf >= cifsFile->srch_inf.entries_in_buffer) {
-                cFYI(1,("can not return entries pos_in_buf beyond last entry"));
+                cFYI(1, ("can not return entries pos_in_buf beyond last"));
                *num_to_ret = 0;
        } else
                *num_to_ret = cifsFile->srch_inf.entries_in_buffer - pos_in_buf;
@@ -748,11 +751,11 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,
        *pinum = 0;
-        if(level == SMB_FIND_FILE_UNIX) {
+        if (level == SMB_FIND_FILE_UNIX) {
                FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;
                filename = &pFindData->FileName[0];
-                if(unicode) {
+                if (unicode) {
                        len = cifs_unicode_bytelen(filename);
                } else {
                        /* BB should we make this strnlen of PATH_MAX? */
@@ -760,49 +763,49 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,
                }
                /* BB fixme - hash low and high 32 bits if not 64 bit arch BB fixme */
-                if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
+                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
                        *pinum = pFindData->UniqueId;
-        } else if(level == SMB_FIND_FILE_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {
                FILE_DIRECTORY_INFO * pFindData = 
                        (FILE_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
                FILE_FULL_DIRECTORY_INFO * pFindData = 
                        (FILE_FULL_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
+        } else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
                SEARCH_ID_FULL_DIR_INFO * pFindData = 
                        (SEARCH_ID_FULL_DIR_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
                *pinum = pFindData->UniqueId;
-        } else if(level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
                FILE_BOTH_DIRECTORY_INFO * pFindData = 
                        (FILE_BOTH_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_INFO_STANDARD) {
+        } else if (level == SMB_FIND_FILE_INFO_STANDARD) {
                FIND_FILE_STANDARD_INFO * pFindData =
                        (FIND_FILE_STANDARD_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                /* one byte length, no name conversion */
                len = (unsigned int)pFindData->FileNameLength;
        } else {
-                cFYI(1,("Unknown findfirst level %d",level));
+                cFYI(1, ("Unknown findfirst level %d", level));
                return -EINVAL;
        }
-        if(len > max_len) {
+        if (len > max_len) {
                cERROR(1,("bad search response length %d past smb end", len));
                return -EINVAL;
        }
-        if(unicode) {
+        if (unicode) {
                /* BB fixme - test with long names */
                /* Note converted filename can be longer than in unicode */
-                if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)
+                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)
                        pqst->len = cifs_convertUCSpath((char *)pqst->name,
                                        (__le16 *)filename, len/2, nlt);
                else
@@ -813,7 +816,7 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,
                pqst->len = len;
        }
        pqst->hash = full_name_hash(pqst->name,pqst->len);
-/*      cFYI(1,("filldir on %s",pqst->name));  */
+/*      cFYI(1, ("filldir on %s",pqst->name));  */
        return rc;
 }
@@ -832,17 +835,17 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
        /* get filename and len into qstring */
        /* get dentry */
        /* decide whether to create and populate ionde */
-        if((direntry == NULL) || (file == NULL))
+        if ((direntry == NULL) || (file == NULL))
                return -EINVAL;
        pCifsF = file->private_data;
        
-        if((scratch_buf == NULL) || (pfindEntry == NULL) || (pCifsF == NULL))
+        if ((scratch_buf == NULL) || (pfindEntry == NULL) || (pCifsF == NULL))
                return -ENOENT;
        rc = cifs_entry_is_dot(pfindEntry,pCifsF);
        /* skip . and .. since we added them first */
-        if(rc != 0) 
+        if (rc != 0)
                return 0;
        cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
@@ -854,16 +857,16 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
                        max_len,
                        &inum /* returned */);
-        if(rc)
+        if (rc)
                return rc;
        rc = construct_dentry(&qstring,file,&tmp_inode, &tmp_dentry);
-        if((tmp_inode == NULL) || (tmp_dentry == NULL))
+        if ((tmp_inode == NULL) || (tmp_dentry == NULL))
                return -ENOMEM;
-        if(rc) {
+        if (rc) {
                /* inode created, we need to hash it with right inode number */
-                if(inum != 0) {
+                if (inum != 0) {
                        /* BB fixme - hash the 2 32 quantities bits together if necessary BB */
                        tmp_inode->i_ino = inum;
                }
@@ -873,27 +876,27 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
        /* we pass in rc below, indicating whether it is a new inode,
           so we can figure out whether to invalidate the inode cached
           data if the file has changed */
-        if(pCifsF->srch_inf.info_level == SMB_FIND_FILE_UNIX)
+        if (pCifsF->srch_inf.info_level == SMB_FIND_FILE_UNIX)
                unix_fill_in_inode(tmp_inode,
                                   (FILE_UNIX_INFO *)pfindEntry,
                                   &obj_type, rc);
-        else if(pCifsF->srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD)
+        else if (pCifsF->srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD)
                fill_in_inode(tmp_inode, 0 /* old level 1 buffer type */,
                                pfindEntry, &obj_type, rc);
        else
                fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc);
-        if(rc) /* new inode - needs to be tied to dentry */ {
+        if (rc) /* new inode - needs to be tied to dentry */ {
                d_instantiate(tmp_dentry, tmp_inode);
-                if(rc == 2)
+                if (rc == 2)
                        d_rehash(tmp_dentry);
        }
        
        
        rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,
                     tmp_inode->i_ino,obj_type);
-        if(rc) {
+        if (rc) {
-                cFYI(1,("filldir rc = %d",rc));
+                cFYI(1, ("filldir rc = %d", rc));
                /* we can not return filldir errors to the caller
                since they are "normal" when the stat blocksize
                is too small - we return remapped error instead */
@@ -912,47 +915,47 @@ static int cifs_save_resume_key(const char *current_entry,
        __u16 level;
        char * filename;
-        if((cifsFile == NULL) || (current_entry == NULL))
+        if ((cifsFile == NULL) || (current_entry == NULL))
                return -EINVAL;
        level = cifsFile->srch_inf.info_level;
-        if(level == SMB_FIND_FILE_UNIX) {
+        if (level == SMB_FIND_FILE_UNIX) {
                FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;
                filename = &pFindData->FileName[0];
-                if(cifsFile->srch_inf.unicode) {
+                if (cifsFile->srch_inf.unicode) {
                        len = cifs_unicode_bytelen(filename);
                } else {
                        /* BB should we make this strnlen of PATH_MAX? */
                        len = strnlen(filename, PATH_MAX);
                }
                cifsFile->srch_inf.resume_key = pFindData->ResumeKey;
-        } else if(level == SMB_FIND_FILE_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {
                FILE_DIRECTORY_INFO * pFindData = 
                        (FILE_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
                cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
                FILE_FULL_DIRECTORY_INFO * pFindData = 
                        (FILE_FULL_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
                cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
+        } else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
                SEARCH_ID_FULL_DIR_INFO * pFindData = 
                        (SEARCH_ID_FULL_DIR_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
                cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
+        } else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
                FILE_BOTH_DIRECTORY_INFO * pFindData = 
                        (FILE_BOTH_DIRECTORY_INFO *)current_entry;
                filename = &pFindData->FileName[0];
                len = le32_to_cpu(pFindData->FileNameLength);
                cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_INFO_STANDARD) {
+        } else if (level == SMB_FIND_FILE_INFO_STANDARD) {
                FIND_FILE_STANDARD_INFO * pFindData =
                        (FIND_FILE_STANDARD_INFO *)current_entry;
                filename = &pFindData->FileName[0];
@@ -960,7 +963,7 @@ static int cifs_save_resume_key(const char *current_entry,
                len = (unsigned int)pFindData->FileNameLength;
                cifsFile->srch_inf.resume_key = pFindData->ResumeKey;
        } else {
-                cFYI(1,("Unknown findfirst level %d",level));
+                cFYI(1, ("Unknown findfirst level %d", level));
                return -EINVAL;
        }
        cifsFile->srch_inf.resume_name_len = len;
@@ -985,7 +988,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
        cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
        pTcon = cifs_sb->tcon;
-        if(pTcon == NULL)
+        if (pTcon == NULL)
                return -EINVAL;
        switch ((int) file->f_pos) {
@@ -1011,22 +1014,22 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                        if it before then restart search
                        if after then keep searching till find it */
-                if(file->private_data == NULL) {
+                if (file->private_data == NULL) {
                        rc = initiate_cifs_search(xid,file);
-                        cFYI(1,("initiate cifs search rc %d",rc));
+                        cFYI(1, ("initiate cifs search rc %d", rc));
-                        if(rc) {
+                        if (rc) {
                                FreeXid(xid);
                                return rc;
                        }
                }
-                if(file->private_data == NULL) {
+                if (file->private_data == NULL) {
                        rc = -EINVAL;
                        FreeXid(xid);
                        return rc;
                }
                cifsFile = file->private_data;
                if (cifsFile->srch_inf.endOfSearch) {
-                        if(cifsFile->srch_inf.emptyDir) {
+                        if (cifsFile->srch_inf.emptyDir) {
                                cFYI(1, ("End of search, empty dir"));
                                rc = 0;
                                break;
@@ -1040,17 +1043,17 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                rc = find_cifs_entry(xid,pTcon, file,
                                &current_entry,&num_to_fill);
-                if(rc) {
+                if (rc) {
-                        cFYI(1,("fce error %d",rc)); 
+                        cFYI(1, ("fce error %d", rc));
                        goto rddir2_exit;
                } else if (current_entry != NULL) {
-                        cFYI(1,("entry %lld found",file->f_pos));
+                        cFYI(1, ("entry %lld found", file->f_pos));
                } else {
-                        cFYI(1,("could not find entry"));
+                        cFYI(1, ("could not find entry"));
                        goto rddir2_exit;
                }
-                cFYI(1,("loop through %d times filling dir for net buf %p",
+                cFYI(1, ("loop through %d times filling dir for net buf %p",
-                        num_to_fill,cifsFile->srch_inf.ntwrk_buf_start));
+                        num_to_fill, cifsFile->srch_inf.ntwrk_buf_start));
                max_len = smbCalcSize((struct smb_hdr *)
                                cifsFile->srch_inf.ntwrk_buf_start);
                end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len;
@@ -1060,8 +1063,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                such multibyte target UTF-8 characters. cifs_unicode.c,
                which actually does the conversion, has the same limit */
                tmp_buf = kmalloc((2 * NAME_MAX) + 4, GFP_KERNEL);
-                for(i=0;(i<num_to_fill) && (rc == 0);i++) {
+                for (i = 0; (i < num_to_fill) && (rc == 0); i++) {
-                        if(current_entry == NULL) {
+                        if (current_entry == NULL) {
                                /* evaluate whether this case is an error */
                                cERROR(1,("past end of SMB num to fill %d i %d",
                                          num_to_fill, i));
@@ -1071,20 +1074,20 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                        we want to check for that here? */
                        rc = cifs_filldir(current_entry, file,
                                        filldir, direntry, tmp_buf, max_len);
-                        if(rc == -EOVERFLOW) {
+                        if (rc == -EOVERFLOW) {
                                rc = 0;
                                break;
                        }
                        file->f_pos++;
-                        if(file->f_pos == 
+                        if (file->f_pos ==
                                cifsFile->srch_inf.index_of_last_entry) {
-                                cFYI(1,("last entry in buf at pos %lld %s",
+                                cFYI(1, ("last entry in buf at pos %lld %s",
-                                        file->f_pos,tmp_buf));
+                                        file->f_pos, tmp_buf));
-                                cifs_save_resume_key(current_entry,cifsFile);
+                                cifs_save_resume_key(current_entry, cifsFile);
                                break;
-                        } else 
+                        } else
-                                current_entry = 
+                                current_entry =
                                        nxt_dir_entry(current_entry, end_of_smb,
                                                cifsFile->srch_inf.info_level);
                }
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 758464630893..623c86cded24 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -3,7 +3,7 @@
 *
 *   SMB/CIFS session setup handling routines
 *
- *   Copyright (c) International Business Machines  Corp., 2006
+ *   Copyright (c) International Business Machines  Corp., 2006, 2007
 *   Author(s): Steve French (sfrench@us.ibm.com)
 *
 *   This library is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include <linux/utsname.h>
 extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
-                         unsigned char *p24);
+                         unsigned char *p24);
 static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
 {
@@ -45,13 +45,14 @@ static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
        /* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */
-        /* BB verify whether signing required on neg or just on auth frame 
+        /* BB verify whether signing required on neg or just on auth frame
           (and NTLM case) */
        capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |
                        CAP_LARGE_WRITE_X | CAP_LARGE_READ_X;
-        if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+        if (ses->server->secMode &
+            (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                pSMB->req.hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
        if (ses->capabilities & CAP_UNICODE) {
@@ -75,9 +76,9 @@ static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
 }
 static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
-                            const struct nls_table * nls_cp)
+                                   const struct nls_table *nls_cp)
 {
-        char * bcc_ptr = *pbcc_area;
+        char *bcc_ptr = *pbcc_area;
        int bytes_ret = 0;
        /* BB FIXME add check that strings total less
@@ -89,7 +90,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
                bcc_ptr++;
        } */
        /* copy user */
-        if(ses->userName == NULL) {
+        if (ses->userName == NULL) {
                /* null user mount */
                *bcc_ptr = 0;
                *(bcc_ptr+1) = 0;
@@ -100,7 +101,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
        bcc_ptr += 2 * bytes_ret;
        bcc_ptr += 2; /* account for null termination */
        /* copy domain */
-        if(ses->domainName == NULL) {
+        if (ses->domainName == NULL) {
                /* Sending null domain better than using a bogus domain name (as
                we did briefly in 2.6.18) since server will use its default */
                *bcc_ptr = 0;
@@ -122,7 +123,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
        bcc_ptr += 2; /* trailing null */
        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS,
-                                  32, nls_cp);
+                                  32, nls_cp);
        bcc_ptr += 2 * bytes_ret;
        bcc_ptr += 2; /* trailing null */
@@ -130,29 +131,29 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
 }
 static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
-                          const struct nls_table * nls_cp)
+                                 const struct nls_table *nls_cp)
 {
-        char * bcc_ptr = *pbcc_area;
+        char *bcc_ptr = *pbcc_area;
        /* copy user */
        /* BB what about null user mounts - check that we do this BB */
-        /* copy user */
+        /* copy user */
-        if(ses->userName == NULL) {
+        if (ses->userName == NULL) {
-                /* BB what about null user mounts - check that we do this BB */
+                /* BB what about null user mounts - check that we do this BB */
-        } else { /* 300 should be long enough for any conceivable user name */
+        } else { /* 300 should be long enough for any conceivable user name */
-                strncpy(bcc_ptr, ses->userName, 300);
+                strncpy(bcc_ptr, ses->userName, 300);
-        }
+        }
        /* BB improve check for overflow */
-        bcc_ptr += strnlen(ses->userName, 300);
+        bcc_ptr += strnlen(ses->userName, 300);
        *bcc_ptr = 0;
-        bcc_ptr++; /* account for null termination */
+        bcc_ptr++; /* account for null termination */
-        /* copy domain */
+        /* copy domain */
-        
-        if(ses->domainName != NULL) {
+        if (ses->domainName != NULL) {
-                strncpy(bcc_ptr, ses->domainName, 256); 
+                strncpy(bcc_ptr, ses->domainName, 256);
                bcc_ptr += strnlen(ses->domainName, 256);
-        } /* else we will send a null domain name 
+        } /* else we will send a null domain name
             so the server will default to its own domain */
        *bcc_ptr = 0;
        bcc_ptr++;
@@ -167,19 +168,20 @@ static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
        strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
        bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
-        *pbcc_area = bcc_ptr;
+        *pbcc_area = bcc_ptr;
 }
-static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,
+static int decode_unicode_ssetup(char **pbcc_area, int bleft,
-                            const struct nls_table * nls_cp)
+                                 struct cifsSesInfo *ses,
+                                 const struct nls_table *nls_cp)
 {
        int rc = 0;
        int words_left, len;
-        char * data = *pbcc_area;
+        char *data = *pbcc_area;
-        cFYI(1,("bleft %d",bleft));
+        cFYI(1, ("bleft %d", bleft));
        /* SMB header is unaligned, so cifs servers word align start of
@@ -198,14 +200,14 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInf
 /* We look for obvious messed up bcc or strings in response so we do not go off
   the end since (at least) WIN2K and Windows XP have a major bug in not null
   terminating last Unicode string in response  */
-        if(len >= words_left)
+        if (len >= words_left)
                return rc;
-        if(ses->serverOS)
+        if (ses->serverOS)
                kfree(ses->serverOS);
        /* UTF-8 string will not grow more than four times as big as UCS-16 */
        ses->serverOS = kzalloc(4 * len, GFP_KERNEL);
-        if(ses->serverOS != NULL) {
+        if (ses->serverOS != NULL) {
                cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len,
                                   nls_cp);
        }
@@ -215,67 +217,68 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInf
        /* save off server network operating system */
        len = UniStrnlen((wchar_t *) data, words_left);
-        if(len >= words_left)
+        if (len >= words_left)
                return rc;
-        if(ses->serverNOS)
+        if (ses->serverNOS)
                kfree(ses->serverNOS);
        ses->serverNOS = kzalloc(4 * len, GFP_KERNEL); /* BB this is wrong length FIXME BB */
-        if(ses->serverNOS != NULL) {
+        if (ses->serverNOS != NULL) {
                cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len,
                                   nls_cp);
-                if(strncmp(ses->serverNOS, "NT LAN Manager 4",16) == 0) {
+                if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) {
-                        cFYI(1,("NT4 server"));
+                        cFYI(1, ("NT4 server"));
                        ses->flags |= CIFS_SES_NT4;
                }
        }
        data += 2 * (len + 1);
        words_left -= len + 1;
-        /* save off server domain */
+        /* save off server domain */
-        len = UniStrnlen((wchar_t *) data, words_left);
+        len = UniStrnlen((wchar_t *) data, words_left);
-        if(len > words_left)
+        if (len > words_left)
-                return rc;
+                return rc;
-        if(ses->serverDomain)
+        if (ses->serverDomain)
-                kfree(ses->serverDomain);
+                kfree(ses->serverDomain);
-        ses->serverDomain = kzalloc(2 * (len + 1), GFP_KERNEL); /* BB FIXME wrong length */
+        ses->serverDomain = kzalloc(2 * (len + 1), GFP_KERNEL); /* BB FIXME wrong length */
-        if(ses->serverDomain != NULL) {
+        if (ses->serverDomain != NULL) {
-                cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len,
+                cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len,
-                                   nls_cp);
+                                   nls_cp);
-                ses->serverDomain[2*len] = 0;
+                ses->serverDomain[2*len] = 0;
-                ses->serverDomain[(2*len) + 1] = 0;
+                ses->serverDomain[(2*len) + 1] = 0;
-        }
+        }
-        data += 2 * (len + 1);
+        data += 2 * (len + 1);
-        words_left -= len + 1;
+        words_left -= len + 1;
-        
-        cFYI(1,("words left: %d",words_left));
+        cFYI(1, ("words left: %d", words_left));
        return rc;
 }
-static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,
+static int decode_ascii_ssetup(char **pbcc_area, int bleft,
-                            const struct nls_table * nls_cp)
+                               struct cifsSesInfo *ses,
+                               const struct nls_table *nls_cp)
 {
        int rc = 0;
        int len;
-        char * bcc_ptr = *pbcc_area;
+        char *bcc_ptr = *pbcc_area;
-        cFYI(1,("decode sessetup ascii. bleft %d", bleft));
+        cFYI(1, ("decode sessetup ascii. bleft %d", bleft));
        
        len = strnlen(bcc_ptr, bleft);
-        if(len >= bleft)
+        if (len >= bleft)
                return rc;
        
-        if(ses->serverOS)
+        if (ses->serverOS)
                kfree(ses->serverOS);
        ses->serverOS = kzalloc(len + 1, GFP_KERNEL);
-        if(ses->serverOS)
+        if (ses->serverOS)
                strncpy(ses->serverOS, bcc_ptr, len);
-        if(strncmp(ses->serverOS, "OS/2",4) == 0) {
+        if (strncmp(ses->serverOS, "OS/2", 4) == 0) {
-                        cFYI(1,("OS/2 server"));
+                        cFYI(1, ("OS/2 server"));
                        ses->flags |= CIFS_SES_OS2;
        }
@@ -283,34 +286,34 @@ static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo
        bleft -= len + 1;
        len = strnlen(bcc_ptr, bleft);
-        if(len >= bleft)
+        if (len >= bleft)
                return rc;
-        if(ses->serverNOS)
+        if (ses->serverNOS)
                kfree(ses->serverNOS);
        ses->serverNOS = kzalloc(len + 1, GFP_KERNEL);
-        if(ses->serverNOS)
+        if (ses->serverNOS)
                strncpy(ses->serverNOS, bcc_ptr, len);
        bcc_ptr += len + 1;
        bleft -= len + 1;
-        len = strnlen(bcc_ptr, bleft);
+        len = strnlen(bcc_ptr, bleft);
-        if(len > bleft)
+        if (len > bleft)
-                return rc;
+                return rc;
        /* No domain field in LANMAN case. Domain is
           returned by old servers in the SMB negprot response */
        /* BB For newer servers which do not support Unicode,
           but thus do return domain here we could add parsing
           for it later, but it is not very important */
-        cFYI(1,("ascii: bytes left %d",bleft));
+        cFYI(1, ("ascii: bytes left %d", bleft));
        return rc;
 }
-int 
+int
 CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                const struct nls_table *nls_cp)
 {
@@ -328,13 +331,13 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        __u16 action;
        int bytes_remaining;
-        if(ses == NULL)
+        if (ses == NULL)
                return -EINVAL;
        type = ses->server->secType;
-        cFYI(1,("sess setup type %d",type));
+        cFYI(1, ("sess setup type %d", type));
-        if(type == LANMAN) {
+        if (type == LANMAN) {
 #ifndef CONFIG_CIFS_WEAK_PW_HASH
                /* LANMAN and plaintext are less secure and off by default.
                So we make this explicitly be turned on in kconfig (in the
@@ -344,15 +347,15 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                return -EOPNOTSUPP;
 #endif
                wct = 10; /* lanman 2 style sessionsetup */
-        } else if((type == NTLM) || (type == NTLMv2)) { 
+        } else if ((type == NTLM) || (type == NTLMv2)) {
                /* For NTLMv2 failures eventually may need to retry NTLM */
                wct = 13; /* old style NTLM sessionsetup */
-        } else /* same size for negotiate or auth, NTLMSSP or extended security */
+        } else /* same size: negotiate or auth, NTLMSSP or extended security */
                wct = 12;
        rc = small_smb_init_no_tc(SMB_COM_SESSION_SETUP_ANDX, wct, ses,
                            (void **)&smb_buf);
-        if(rc)
+        if (rc)
                return rc;
        pSMB = (SESSION_SETUP_ANDX *)smb_buf;
@@ -364,8 +367,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        second part which will include the strings
        and rest of bcc area, in order to avoid having
        to do a large buffer 17K allocation */
-        iov[0].iov_base = (char *)pSMB;
+        iov[0].iov_base = (char *)pSMB;
-        iov[0].iov_len = smb_buf->smb_buf_length + 4;
+        iov[0].iov_len = smb_buf->smb_buf_length + 4;
        /* 2000 big enough to fit max user, domain, NOS name etc. */
        str_area = kmalloc(2000, GFP_KERNEL);
@@ -373,18 +376,18 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        ses->flags &= ~CIFS_SES_LANMAN;
-        if(type == LANMAN) {
+        if (type == LANMAN) {
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
                char lnm_session_key[CIFS_SESS_KEY_SIZE];
                /* no capabilities flags in old lanman negotiation */
-                pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); 
+                pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);
                /* BB calculate hash with password */
                /* and copy into bcc */
                calc_lanman_hash(ses, lnm_session_key);
-                ses->flags |= CIFS_SES_LANMAN; 
+                ses->flags |= CIFS_SES_LANMAN;
 /* #ifdef CONFIG_CIFS_DEBUG2
                cifs_dump_mem("cryptkey: ",ses->server->cryptKey,
                        CIFS_SESS_KEY_SIZE);
@@ -397,10 +400,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                changed to do higher than lanman dialect and
                we reconnected would we ever calc signing_key? */
-                cFYI(1,("Negotiating LANMAN setting up strings"));
+                cFYI(1, ("Negotiating LANMAN setting up strings"));
                /* Unicode not allowed for LANMAN dialects */
                ascii_ssetup_strings(&bcc_ptr, ses, nls_cp);
-#endif    
+#endif
        } else if (type == NTLM) {
                char ntlm_session_key[CIFS_SESS_KEY_SIZE];
@@ -414,33 +417,33 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                SMBNTencrypt(ses->password, ses->server->cryptKey,
                             ntlm_session_key);
-                if(first_time) /* should this be moved into common code 
+                if (first_time) /* should this be moved into common code
                                  with similar ntlmv2 path? */
                        cifs_calculate_mac_key(ses->server->mac_signing_key,
                                ntlm_session_key, ses->password);
                /* copy session key */
-                memcpy(bcc_ptr, (char *)ntlm_session_key,CIFS_SESS_KEY_SIZE);
+                memcpy(bcc_ptr, (char *)ntlm_session_key, CIFS_SESS_KEY_SIZE);
                bcc_ptr += CIFS_SESS_KEY_SIZE;
-                memcpy(bcc_ptr, (char *)ntlm_session_key,CIFS_SESS_KEY_SIZE);
+                memcpy(bcc_ptr, (char *)ntlm_session_key, CIFS_SESS_KEY_SIZE);
                bcc_ptr += CIFS_SESS_KEY_SIZE;
-                if(ses->capabilities & CAP_UNICODE) {
+                if (ses->capabilities & CAP_UNICODE) {
                        /* unicode strings must be word aligned */
                        if (iov[0].iov_len % 2) {
                                *bcc_ptr = 0;
-                                bcc_ptr++;              
+                                bcc_ptr++;
-                        }       
+                        }
                        unicode_ssetup_strings(&bcc_ptr, ses, nls_cp);
                } else
                        ascii_ssetup_strings(&bcc_ptr, ses, nls_cp);
        } else if (type == NTLMv2) {
-                char * v2_sess_key = 
+                char *v2_sess_key =
                        kmalloc(sizeof(struct ntlmv2_resp), GFP_KERNEL);
                /* BB FIXME change all users of v2_sess_key to
                   struct ntlmv2_resp */
-                if(v2_sess_key == NULL) {
+                if (v2_sess_key == NULL) {
                        cifs_small_buf_release(smb_buf);
                        return -ENOMEM;
                }
@@ -456,8 +459,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                /* calculate session key */
                setup_ntlmv2_rsp(ses, v2_sess_key, nls_cp);
-                if(first_time) /* should this be moved into common code
+                if (first_time) /* should this be moved into common code
-                                  with similar ntlmv2 path? */
+                                   with similar ntlmv2 path? */
                /*   cifs_calculate_ntlmv2_mac_key(ses->server->mac_signing_key,
                                response BB FIXME, v2_sess_key); */
@@ -468,8 +471,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                memcpy(bcc_ptr, (char *)v2_sess_key, sizeof(struct ntlmv2_resp));
                bcc_ptr += sizeof(struct ntlmv2_resp);
                kfree(v2_sess_key);
-                if(ses->capabilities & CAP_UNICODE) {
+                if (ses->capabilities & CAP_UNICODE) {
-                        if(iov[0].iov_len % 2) {
+                        if (iov[0].iov_len % 2) {
                                *bcc_ptr = 0;
                        }       bcc_ptr++;
                        unicode_ssetup_strings(&bcc_ptr, ses, nls_cp);
@@ -488,20 +491,20 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        BCC_LE(smb_buf) = cpu_to_le16(count);
        iov[1].iov_base = str_area;
-        iov[1].iov_len = count; 
+        iov[1].iov_len = count;
        rc = SendReceive2(xid, ses, iov, 2 /* num_iovecs */, &resp_buf_type, 0);
        /* SMB request buf freed in SendReceive2 */
-        cFYI(1,("ssetup rc from sendrecv2 is %d",rc));
+        cFYI(1, ("ssetup rc from sendrecv2 is %d", rc));
-        if(rc)
+        if (rc)
                goto ssetup_exit;
        pSMB = (SESSION_SETUP_ANDX *)iov[0].iov_base;
        smb_buf = (struct smb_hdr *)iov[0].iov_base;
-        if((smb_buf->WordCount != 3) && (smb_buf->WordCount != 4)) {
+        if ((smb_buf->WordCount != 3) && (smb_buf->WordCount != 4)) {
                rc = -EIO;
-                cERROR(1,("bad word count %d", smb_buf->WordCount));
+                cERROR(1, ("bad word count %d", smb_buf->WordCount));
                goto ssetup_exit;
        }
        action = le16_to_cpu(pSMB->resp.Action);
@@ -514,20 +517,20 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        bytes_remaining = BCC(smb_buf);
        bcc_ptr = pByteArea(smb_buf);
-        if(smb_buf->WordCount == 4) {
+        if (smb_buf->WordCount == 4) {
                __u16 blob_len;
                blob_len = le16_to_cpu(pSMB->resp.SecurityBlobLength);
                bcc_ptr += blob_len;
-                if(blob_len > bytes_remaining) {
+                if (blob_len > bytes_remaining) {
-                        cERROR(1,("bad security blob length %d", blob_len));
+                        cERROR(1, ("bad security blob length %d", blob_len));
                        rc = -EINVAL;
                        goto ssetup_exit;
                }
                bytes_remaining -= blob_len;
-        }       
+        }
        /* BB check if Unicode and decode strings */
-        if(smb_buf->Flags2 & SMBFLG2_UNICODE)
+        if (smb_buf->Flags2 & SMBFLG2_UNICODE)
                rc = decode_unicode_ssetup(&bcc_ptr, bytes_remaining,
                                                   ses, nls_cp);
        else
@@ -535,10 +538,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
        
 ssetup_exit:
        kfree(str_area);
-        if(resp_buf_type == CIFS_SMALL_BUFFER) {
+        if (resp_buf_type == CIFS_SMALL_BUFFER) {
-                cFYI(1,("ssetup freeing small buf %p", iov[0].iov_base));
+                cFYI(1, ("ssetup freeing small buf %p", iov[0].iov_base));
                cifs_small_buf_release(iov[0].iov_base);
-        } else if(resp_buf_type == CIFS_LARGE_BUFFER)
+        } else if (resp_buf_type == CIFS_LARGE_BUFFER)
                cifs_buf_release(iov[0].iov_base);
        return rc;
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
index 4b25ba92180d..1966adaf0b29 100644
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -1,4 +1,4 @@
-/* 
+/*
   Unix SMB/Netbios implementation.
   Version 1.9.
   SMB parameters and setup
@@ -57,7 +57,7 @@ void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24);
 /*
   This implements the X/Open SMB password encryption
-   It takes a password, a 8 byte "crypt key" and puts 24 bytes of 
+   It takes a password, a 8 byte "crypt key" and puts 24 bytes of
   encrypted password into p24 */
 /* Note that password must be uppercased and null terminated */
 void
@@ -74,8 +74,8 @@ SMBencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24)
        SMBOWFencrypt(p21, c8, p24);
        
-        memset(p14,0,15);
+        memset(p14, 0, 15);
-        memset(p21,0,21);
+        memset(p21, 0, 21);
 }
 /* Routines for Windows NT MD4 Hash functions. */
@@ -90,14 +90,14 @@ _my_wcslen(__u16 * str)
 /*
 * Convert a string into an NT UNICODE string.
- * Note that regardless of processor type 
+ * Note that regardless of processor type
 * this must be in intel (little-endian)
 * format.
 */
 static int
 _my_mbstowcs(__u16 * dst, const unsigned char *src, int len)
-{                               /* not a very good conversion routine - change/fix */
+{       /* BB not a very good conversion routine - change/fix */
        int i;
        __u16 val;
@@ -112,7 +112,7 @@ _my_mbstowcs(__u16 * dst, const unsigned char *src, int len)
        return i;
 }
-/* 
+/*
 * Creates the MD4 Hash of the users password in NT UNICODE.
 */
@@ -123,7 +123,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16)
        __u16 wpwd[129];
        /* Password cannot be longer than 128 characters */
-        if(passwd) {
+        if (passwd) {
                len = strlen((char *) passwd);
                if (len > 128) {
                        len = 128;
@@ -138,7 +138,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16)
        len = _my_wcslen(wpwd) * sizeof (__u16);
        mdfour(p16, (unsigned char *) wpwd, len);
-        memset(wpwd,0,129 * 2);
+        memset(wpwd, 0, 129 * 2);
 }
 #if 0 /* currently unused */
@@ -184,8 +184,8 @@ ntv2_owf_gen(const unsigned char owf[16], const char *user_n,
        struct HMACMD5Context ctx;
        /* might as well do one alloc to hold both (user_u and dom_u) */
-        user_u = kmalloc(2048 * sizeof(wchar_t),GFP_KERNEL); 
+        user_u = kmalloc(2048 * sizeof(wchar_t), GFP_KERNEL);
-        if(user_u == NULL)
+        if (user_u == NULL)
                return;
        dom_u = user_u + 1024;
    
@@ -206,7 +206,7 @@ ntv2_owf_gen(const unsigned char owf[16], const char *user_n,
        kfree(user_u);
 }
-#endif 
+#endif
 /* Does the des encryption from the NT or LM MD4 hash. */
 static void
@@ -256,15 +256,15 @@ SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24)
 #if 0
 static void
 SMBOWFencrypt_ntv2(const unsigned char kr[16],
-                   const struct data_blob * srv_chal,
+                   const struct data_blob *srv_chal,
-                   const struct data_blob * cli_chal, unsigned char resp_buf[16])
+                   const struct data_blob *cli_chal, unsigned char resp_buf[16])
 {
-        struct HMACMD5Context ctx;
+        struct HMACMD5Context ctx;
-        hmac_md5_init_limK_to_64(kr, 16, &ctx);
+        hmac_md5_init_limK_to_64(kr, 16, &ctx);
-        hmac_md5_update(srv_chal->data, srv_chal->length, &ctx);
+        hmac_md5_update(srv_chal->data, srv_chal->length, &ctx);
-        hmac_md5_update(cli_chal->data, cli_chal->length, &ctx);
+        hmac_md5_update(cli_chal->data, cli_chal->length, &ctx);
-        hmac_md5_final(resp_buf, &ctx);
+        hmac_md5_final(resp_buf, &ctx);
 }
 static void