1 files changed, 867 insertions, 754 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 57419a176688..8eb102f940d4 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -48,7 +48,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"},
        {POSIX_PROT, "\2POSIX 2"},
        {BAD_PROT, "\2"}
 };
@@ -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,75 +113,78 @@ 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_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)){
+                                  (tcon->ses->server)) {
                        struct nls_table *nls_codepage;
-                                /* Give Demultiplex thread up to 10 seconds to 
+                                /* Give Demultiplex thread up to 10 seconds to
                                   reconnect, should be greater than cifs socket
                                   timeout which is 7 seconds */
-                        while(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
+                        while (tcon->ses->server->tcpStatus ==
+                                                         CifsNeedReconnect) {
                                wait_event_interruptible_timeout(tcon->ses->server->response_q,
-                                        (tcon->ses->server->tcpStatus == CifsGood), 10 * HZ);
+                                        (tcon->ses->server->tcpStatus ==
-                                if(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
+                                                        CifsGood), 10 * HZ);
+                                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"));
+                                                cFYI(1, ("gave up waiting on "
+                                                      "reconnect in smb_init"));
                                                return -EHOSTDOWN;
                                        } /* else "hard" mount - keep retrying
                                             until process is killed or server
                                             comes back on-line */
                                } else /* TCP session is reestablished now */
                                        break;
-                                 
                        }
-                        
                        nls_codepage = load_nls_default();
                /* 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, 
+                                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, 
+                                rc = CIFSTCon(0, tcon->ses, tcon->treeName,
                                              tcon, nls_codepage);
                                up(&tcon->ses->sesSem);
                                /* tell server which Unix caps we support */
                                if (tcon->ses->capabilities & CAP_UNIX)
                                        reset_cifs_unix_caps(0 /* no xid */,
-                                                tcon, 
+                                                tcon,
                                                NULL /* we do not know sb */,
-                                                NULL /* no vol info */);        
+                                                NULL /* no vol info */);
                                /* 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));
-                                /* Removed call to reopen open files here - 
+                                /* Removed call to reopen open files here.
-                                   it is safer (and faster) to reopen files
+                                   It is safer (and faster) to reopen files
                                   one at a time as needed in read and write */
-                                /* Check if handle based operation so we 
+                                /* Check if handle based operation so we
                                   know whether we can continue or not without
                                   returning to caller to reset file handle */
-                                switch(smb_command) {
+                                switch (smb_command) {
                                        case SMB_COM_READ_ANDX:
                                        case SMB_COM_WRITE_ANDX:
                                        case SMB_COM_CLOSE:
@@ -200,7 +203,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();
@@ -209,23 +212,24 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                return -ENOMEM;
        }
-        header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,wct);
+        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;
 }
 int
-small_smb_init_no_tc(const int smb_command, const int wct, 
+small_smb_init_no_tc(const int smb_command, const int wct,
                     struct cifsSesInfo *ses, void **request_buf)
 {
        int rc;
-        struct smb_hdr * buffer;
+        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;
@@ -237,7 +241,7 @@ small_smb_init_no_tc(const int smb_command, const int wct,
        /* uid, tid can stay at zero as set in header assemble */
-        /* BB add support for turning on the signing when 
+        /* BB add support for turning on the signing when
        this function is used after 1st of session setup requests */
        return rc;
@@ -254,52 +258,53 @@ 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)){
+                                  (tcon->ses->server)) {
                        struct nls_table *nls_codepage;
                                /* Give Demultiplex thread up to 10 seconds to
                                   reconnect, should be greater than cifs socket
                                   timeout which is 7 seconds */
-                        while(tcon->ses->server->tcpStatus == CifsNeedReconnect) {
+                        while (tcon->ses->server->tcpStatus ==
+                                                        CifsNeedReconnect) {
                                wait_event_interruptible_timeout(tcon->ses->server->response_q,
-                                        (tcon->ses->server->tcpStatus == CifsGood), 10 * HZ);
+                                        (tcon->ses->server->tcpStatus ==
-                                if(tcon->ses->server->tcpStatus == 
+                                                        CifsGood), 10 * HZ);
+                                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"));
+                                                cFYI(1, ("gave up waiting on "
+                                                      "reconnect in smb_init"));
                                                return -EHOSTDOWN;
                                        } /* else "hard" mount - keep retrying
                                             until process is killed or server
                                             comes on-line */
                                } else /* TCP session is reestablished now */
                                        break;
-                                 
                        }
-                        
                        nls_codepage = load_nls_default();
                /* 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, 
+                                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);
@@ -307,24 +312,24 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                                /* tell server which Unix caps we support */
                                if (tcon->ses->capabilities & CAP_UNIX)
                                        reset_cifs_unix_caps(0 /* no xid */,
-                                                tcon, 
+                                                tcon,
                                                NULL /* do not know sb */,
                                                NULL /* no vol info */);
                                /* 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));
-                                /* Removed call to reopen open files here - 
+                                /* Removed call to reopen open files here.
-                                   it is safer (and faster) to reopen files
+                                   It is safer (and faster) to reopen files
                                   one at a time as needed in read and write */
-                                /* Check if handle based operation so we 
+                                /* Check if handle based operation so we
                                   know whether we can continue or not without
                                   returning to caller to reset file handle */
-                                switch(smb_command) {
+                                switch (smb_command) {
                                        case SMB_COM_READ_ANDX:
                                        case SMB_COM_WRITE_ANDX:
                                        case SMB_COM_CLOSE:
@@ -343,7 +348,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,48 +360,48 @@ 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; 
+                *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;
 }
-static int validate_t2(struct smb_t2_rsp * pSMB) 
+static int validate_t2(struct smb_t2_rsp *pSMB)
 {
        int rc = -EINVAL;
        int total_size;
-        char * pBCC;
+        char *pBCC;
        /* 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);
+                                total_size +=
+                                        le16_to_cpu(pSMB->t2_rsp.DataCount);
                                /* BCC le converted in SendReceive */
-                                pBCC = (pSMB->hdr.WordCount * 2) + 
+                                pBCC = (pSMB->hdr.WordCount * 2) +
                                        sizeof(struct smb_hdr) +
                                        (char *)pSMB;
-                                if((total_size <= (*(u16 *)pBCC)) && 
+                                if ((total_size <= (*(u16 *)pBCC)) &&
-                                   (total_size < 
+                                   (total_size <
                                        CIFSMaxBufSize+MAX_CIFS_HDR_SIZE)) {
                                        return 0;
                                }
-                                
                        }
                }
        }
-        cifs_dump_mem("Invalid transact2 SMB: ",(char *)pSMB,
+        cifs_dump_mem("Invalid transact2 SMB: ", (char *)pSMB,
                sizeof(struct smb_t2_rsp) + 16);
        return rc;
 }
@@ -408,12 +413,12 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
        int rc = 0;
        int bytes_returned;
        int i;
-        struct TCP_Server_Info * server;
+        struct TCP_Server_Info *server;
        u16 count;
        unsigned int secFlags;
        u16 dialect;
-        if(ses->server)
+        if (ses->server)
                server = ses->server;
        else {
                rc = -EIO;
@@ -425,20 +430,20 @@ 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;
+                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;
-        cFYI(1,("secFlags 0x%x",secFlags));
+        cFYI(1, ("secFlags 0x%x", secFlags));
        pSMB->hdr.Mid = GetNextMid(server);
        pSMB->hdr.Flags2 |= (SMBFLG2_UNICODE | SMBFLG2_ERR_STATUS);
        if ((secFlags & CIFSSEC_MUST_KRB5) == CIFSSEC_MUST_KRB5)
                pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC;
-        
        count = 0;
-        for(i=0;i<CIFS_NUM_PROT;i++) {
+        for (i = 0; i < CIFS_NUM_PROT; i++) {
                strncpy(pSMB->DialectsArray+count, protocols[i].name, 16);
                count += strlen(protocols[i].name) + 1;
                /* null at end of source and target buffers anyway */
@@ -448,26 +453,26 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
        rc = SendReceive(xid, ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        if (rc != 0) 
+        if (rc != 0)
                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 
+                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 
+#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;
+                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 {
@@ -475,7 +480,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                                   " in /proc/fs/cifs/SecurityFlags"));
                        rc = -EOPNOTSUPP;
                        goto neg_err_exit;
-                }       
+                }
                server->secMode = (__u8)le16_to_cpu(rsp->SecurityMode);
                server->maxReq = le16_to_cpu(rsp->MaxMpxCount);
                server->maxBuf = min((__u32)le16_to_cpu(rsp->MaxBufSize),
@@ -483,7 +488,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 {
@@ -504,29 +509,29 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
                        utc = CURRENT_TIME;
                        ts = cnvrtDosUnixTm(le16_to_cpu(rsp->SrvTime.Date),
                                                le16_to_cpu(rsp->SrvTime.Time));
-                        cFYI(1,("SrvTime: %d sec since 1970 (utc: %d) diff: %d",
+                        cFYI(1, ("SrvTime %d sec since 1970 (utc: %d) diff: %d",
-                                (int)ts.tv_sec, (int)utc.tv_sec, 
+                                (int)ts.tv_sec, (int)utc.tv_sec,
                                (int)(utc.tv_sec - ts.tv_sec)));
                        val = (int)(utc.tv_sec - ts.tv_sec);
                        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
-                code to use it and timezone since this is not UTC */    
+                code to use it and timezone since this is not UTC */
-                if (rsp->EncryptionKeyLength == 
+                if (rsp->EncryptionKeyLength ==
                                cpu_to_le16(CIFS_CRYPTO_KEY_SIZE)) {
                        memcpy(server->cryptKey, rsp->EncryptionKey,
                                CIFS_CRYPTO_KEY_SIZE);
@@ -535,39 +540,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 "
+                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"
+                        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 ... */
@@ -596,7 +601,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
        /* BB might be helpful to save off the domain of server here */
-        if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC) && 
+        if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC) &&
                (server->capabilities & CAP_EXTENDED_SECURITY)) {
                count = pSMBr->ByteCount;
                if (count < 16)
@@ -620,7 +625,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 {
@@ -633,26 +638,37 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
 signing_check:
 #endif
-        if(sign_CIFS_PDUs == FALSE) {        
+        if ((secFlags & CIFSSEC_MAY_SIGN) == 0) {
-                if(server->secMode & SECMODE_SIGN_REQUIRED)
+                /* MUST_SIGN already includes the MAY_SIGN FLAG
-                        cERROR(1,("Server requires "
+                   so if this is zero it means that signing is disabled */
-                                 "/proc/fs/cifs/PacketSigningEnabled to be on"));
+                cFYI(1, ("Signing disabled"));
-                server->secMode &= 
+                if (server->secMode & SECMODE_SIGN_REQUIRED)
+                        cERROR(1, ("Server requires "
+                                   "/proc/fs/cifs/PacketSigningEnabled "
+                                   "to be on"));
+                server->secMode &=
                        ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
-        } else if(sign_CIFS_PDUs == 1) {
+        } else if ((secFlags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) {
-                if((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
+                /* signing required */
-                        server->secMode &= 
+                cFYI(1, ("Must sign - secFlags 0x%x", secFlags));
-                                ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
+                if ((server->secMode &
-        } else if(sign_CIFS_PDUs == 2) {
-                if((server->secMode & 
                        (SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {
-                        cERROR(1,("signing required but server lacks support"));
+                        cERROR(1,
-                }
+                                ("signing required but server lacks support"));
+                        rc = -EOPNOTSUPP;
+                } else
+                        server->secMode |= SECMODE_SIGN_REQUIRED;
+        } else {
+                /* signing optional ie CIFSSEC_MAY_SIGN */
+                if ((server->secMode & SECMODE_SIGN_REQUIRED) == 0)
+                        server->secMode &=
+                                ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
        }
-neg_err_exit:   
+neg_err_exit:
        cifs_buf_release(pSMB);
-        cFYI(1,("negprot rc %d",rc));
+        cFYI(1, ("negprot rc %d", rc));
        return rc;
 }
@@ -669,7 +685,7 @@ CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon)
         *  If last user of the connection and
         *  connection alive - disconnect it
         *  If this is the last connection on the server session disconnect it
-         *  (and inside session disconnect we should check if tcp socket needs 
+         *  (and inside session disconnect we should check if tcp socket needs
         *  to be freed and kernel thread woken up).
         */
        if (tcon)
@@ -683,18 +699,18 @@ CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon)
                return -EBUSY;
        }
-        /* No need to return error on this operation if tid invalidated and 
+        /* 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;  
+                return 0;
        }
-        if((tcon->ses == NULL) || (tcon->ses->server == NULL)) {    
+        if ((tcon->ses == NULL) || (tcon->ses->server == NULL)) {
                up(&tcon->tconSem);
                return -EIO;
        }
-        rc = small_smb_init(SMB_COM_TREE_DISCONNECT, 0, tcon, 
+        rc = small_smb_init(SMB_COM_TREE_DISCONNECT, 0, tcon,
                            (void **)&smb_buffer);
        if (rc) {
                up(&tcon->tconSem);
@@ -711,7 +727,7 @@ CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon)
                cifs_small_buf_release(smb_buffer);
        up(&tcon->tconSem);
-        /* No need to return error on this operation if tid invalidated and 
+        /* No need to return error on this operation if tid invalidated and
        closed on server already e.g. due to tcp session crashing */
        if (rc == -EAGAIN)
                rc = 0;
@@ -745,11 +761,11 @@ 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;
        }
@@ -772,7 +788,7 @@ CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses)
        cifs_small_buf_release(pSMB);
        /* if session dead then we do not need to do ulogoff,
-                since server closed smb session, no sense reporting 
+                since server closed smb session, no sense reporting
                error */
        if (rc == -EAGAIN)
                rc = 0;
@@ -780,6 +796,82 @@ CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses)
 }
 int
+CIFSPOSIXDelFile(const int xid, struct cifsTconInfo *tcon, const char *fileName,
+                 __u16 type, const struct nls_table *nls_codepage, int remap)
+{
+        TRANSACTION2_SPI_REQ *pSMB = NULL;
+        TRANSACTION2_SPI_RSP *pSMBr = NULL;
+        struct unlink_psx_rq *pRqD;
+        int name_len;
+        int rc = 0;
+        int bytes_returned = 0;
+        __u16 params, param_offset, offset, byte_count;
+        cFYI(1, ("In POSIX delete"));
+PsxDelete:
+        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
+                      (void **) &pSMBr);
+        if (rc)
+                return rc;
+        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
+                name_len =
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
+                                     PATH_MAX, nls_codepage, remap);
+                name_len++;     /* trailing null */
+                name_len *= 2;
+        } else { /* BB add path length overrun check */
+                name_len = strnlen(fileName, PATH_MAX);
+                name_len++;     /* trailing null */
+                strncpy(pSMB->FileName, fileName, name_len);
+        }
+        params = 6 + name_len;
+        pSMB->MaxParameterCount = cpu_to_le16(2);
+        pSMB->MaxDataCount = 0; /* BB double check this with jra */
+        pSMB->MaxSetupCount = 0;
+        pSMB->Reserved = 0;
+        pSMB->Flags = 0;
+        pSMB->Timeout = 0;
+        pSMB->Reserved2 = 0;
+        param_offset = offsetof(struct smb_com_transaction2_spi_req,
+                                InformationLevel) - 4;
+        offset = param_offset + params;
+        /* Setup pointer to Request Data (inode type) */
+        pRqD = (struct unlink_psx_rq *)(((char *)&pSMB->hdr.Protocol) + offset);
+        pRqD->type = cpu_to_le16(type);
+        pSMB->ParameterOffset = cpu_to_le16(param_offset);
+        pSMB->DataOffset = cpu_to_le16(offset);
+        pSMB->SetupCount = 1;
+        pSMB->Reserved3 = 0;
+        pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION);
+        byte_count = 3 /* pad */  + params + sizeof(struct unlink_psx_rq);
+        pSMB->DataCount = cpu_to_le16(sizeof(struct unlink_psx_rq));
+        pSMB->TotalDataCount = cpu_to_le16(sizeof(struct unlink_psx_rq));
+        pSMB->ParameterCount = cpu_to_le16(params);
+        pSMB->TotalParameterCount = pSMB->ParameterCount;
+        pSMB->InformationLevel = cpu_to_le16(SMB_POSIX_UNLINK);
+        pSMB->Reserved4 = 0;
+        pSMB->hdr.smb_buf_length += byte_count;
+        pSMB->ByteCount = cpu_to_le16(byte_count);
+        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
+                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
+        if (rc) {
+                cFYI(1, ("Posix delete returned %d", rc));
+        }
+        cifs_buf_release(pSMB);
+        cifs_stats_inc(&tcon->num_deletes);
+        if (rc == -EAGAIN)
+                goto PsxDelete;
+        return rc;
+}
+int
 CIFSSMBDelFile(const int xid, struct cifsTconInfo *tcon, const char *fileName,
               const struct nls_table *nls_codepage, int remap)
 {
@@ -797,7 +889,7 @@ DelFileRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->fileName, fileName, 
+                    cifsConvertToUCS((__le16 *) pSMB->fileName, fileName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -816,7 +908,7 @@ DelFileRetry:
        cifs_stats_inc(&tcon->num_deletes);
        if (rc) {
                cFYI(1, ("Error in RMFile = %d", rc));
-        } 
+        }
        cifs_buf_release(pSMB);
        if (rc == -EAGAIN)
@@ -826,7 +918,7 @@ DelFileRetry:
 }
 int
-CIFSSMBRmDir(const int xid, struct cifsTconInfo *tcon, const char *dirName, 
+CIFSSMBRmDir(const int xid, struct cifsTconInfo *tcon, const char *dirName,
             const struct nls_table *nls_codepage, int remap)
 {
        DELETE_DIRECTORY_REQ *pSMB = NULL;
@@ -887,7 +979,7 @@ MkDirRetry:
                return rc;
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->DirName, name, 
+                name_len = cifsConvertToUCS((__le16 *) pSMB->DirName, name,
                                            PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -916,7 +1008,7 @@ MkDirRetry:
 int
 CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon, __u32 posix_flags,
                __u64 mode, __u16 * netfid, FILE_UNIX_BASIC_INFO *pRetData,
-                __u32 *pOplock, const char *name, 
+                __u32 *pOplock, const char *name,
                const struct nls_table *nls_codepage, int remap)
 {
        TRANSACTION2_SPI_REQ *pSMB = NULL;
@@ -924,7 +1016,6 @@ CIFSPOSIXCreate(const int xid, struct cifsTconInfo *tcon, __u32 posix_flags,
        int name_len;
        int rc = 0;
        int bytes_returned = 0;
-        char *data_offset;
        __u16 params, param_offset, offset, byte_count, count;
        OPEN_PSX_REQ * pdata;
        OPEN_PSX_RSP * psx_rsp;
@@ -958,13 +1049,12 @@ PsxCreat:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
-        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
        pdata = (OPEN_PSX_REQ *)(((char *)&pSMB->hdr.Protocol) + offset);
        pdata->Level = SMB_QUERY_FILE_UNIX_BASIC;
        pdata->Permissions = cpu_to_le64(mode);
-        pdata->PosixOpenFlags = cpu_to_le32(posix_flags); 
+        pdata->PosixOpenFlags = cpu_to_le32(posix_flags);
        pdata->OpenFlags =  cpu_to_le32(*pOplock);
        pSMB->ParameterOffset = cpu_to_le16(param_offset);
        pSMB->DataOffset = cpu_to_le16(offset);
@@ -979,7 +1069,7 @@ PsxCreat:
        pSMB->TotalParameterCount = pSMB->ParameterCount;
        pSMB->InformationLevel = cpu_to_le16(SMB_POSIX_OPEN);
        pSMB->Reserved4 = 0;
-        pSMB->hdr.smb_buf_length += byte_count; 
+        pSMB->hdr.smb_buf_length += byte_count;
        pSMB->ByteCount = cpu_to_le16(byte_count);
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
@@ -988,7 +1078,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))) {
@@ -997,34 +1087,33 @@ PsxCreat:
        }
        /* copy return information to pRetData */
-        psx_rsp = (OPEN_PSX_RSP *)((char *) &pSMBr->hdr.Protocol 
+        psx_rsp = (OPEN_PSX_RSP *)((char *) &pSMBr->hdr.Protocol
                        + 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"));
+                        cERROR(1, ("Open response data too small"));
                        pRetData->Type = -1;
                        goto psx_create_err;
                }
-                memcpy((char *) pRetData, 
+                memcpy((char *) pRetData,
                        (char *)psx_rsp + sizeof(OPEN_PSX_RSP),
                        sizeof (FILE_UNIX_BASIC_INFO));
        }
-                        
 psx_create_err:
        cifs_buf_release(pSMB);
@@ -1034,7 +1123,7 @@ psx_create_err:
        if (rc == -EAGAIN)
                goto PsxCreat;
-        return rc;      
+        return rc;
 }
 static __u16 convert_disposition(int disposition)
@@ -1061,7 +1150,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;
@@ -1071,7 +1160,7 @@ int
 SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
            const char *fileName, const int openDisposition,
            const int access_flags, const int create_options, __u16 * netfid,
-            int *pOplock, FILE_ALL_INFO * pfile_info,
+            int *pOplock, FILE_ALL_INFO * pfile_info,
            const struct nls_table *nls_codepage, int remap)
 {
        int rc = -EACCES;
@@ -1113,16 +1202,16 @@ OldOpenRetry:
           1 = write
           2 = rw
           3 = execute
-        */
+         */
        pSMB->Mode = cpu_to_le16(2);
        pSMB->Mode |= cpu_to_le16(0x40); /* deny none */
        /* 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_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)
@@ -1132,7 +1221,8 @@ OldOpenRetry:
            being created */
        /* BB FIXME BB */
-/*      pSMB->CreateOptions = cpu_to_le32(create_options & CREATE_OPTIONS_MASK); */
+/*      pSMB->CreateOptions = cpu_to_le32(create_options &
+                                                 CREATE_OPTIONS_MASK); */
        /* BB FIXME END BB */
        pSMB->Sattr = cpu_to_le16(ATTR_HIDDEN | ATTR_SYSTEM | ATTR_DIRECTORY);
@@ -1143,7 +1233,7 @@ OldOpenRetry:
        pSMB->ByteCount = cpu_to_le16(count);
        /* long_op set to 1 to allow for oplock break timeouts */
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
-                         (struct smb_hdr *) pSMBr, &bytes_returned, 1);
+                         (struct smb_hdr *) pSMBr, &bytes_returned, 1);
        cifs_stats_inc(&tcon->num_opens);
        if (rc) {
                cFYI(1, ("Error in Open = %d", rc));
@@ -1156,17 +1246,17 @@ 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 */
                        pfile_info->ChangeTime = 0;  /* BB fixme */
                        pfile_info->Attributes =
-                                cpu_to_le32(le16_to_cpu(pSMBr->FileAttributes)); 
+                                cpu_to_le32(le16_to_cpu(pSMBr->FileAttributes));
                        /* the file_info buf is endian converted by caller */
                        pfile_info->AllocationSize =
                                cpu_to_le64(le32_to_cpu(pSMBr->EndOfFile));
@@ -1185,7 +1275,7 @@ int
 CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon,
            const char *fileName, const int openDisposition,
            const int access_flags, const int create_options, __u16 * netfid,
-            int *pOplock, FILE_ALL_INFO * pfile_info, 
+            int *pOplock, FILE_ALL_INFO * pfile_info,
            const struct nls_table *nls_codepage, int remap)
 {
        int rc = -EACCES;
@@ -1228,7 +1318,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);
@@ -1266,10 +1356,10 @@ 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; 
+                        *pOplock |= CIFS_CREATE_ACTION;
-                if(pfile_info) {
+                if (pfile_info) {
-                    memcpy((char *)pfile_info,(char *)&pSMBr->CreationTime,
+                    memcpy((char *)pfile_info, (char *)&pSMBr->CreationTime,
                        36 /* CreationTime to Attributes */);
                    /* the file_info buf is endian converted by caller */
                    pfile_info->AllocationSize = pSMBr->AllocationSize;
@@ -1285,10 +1375,9 @@ openRetry:
 }
 int
-CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
+CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, const int netfid,
-            const int netfid, const unsigned int count,
+            const unsigned int count, const __u64 lseek, unsigned int *nbytes,
-            const __u64 lseek, unsigned int *nbytes, char **buf,
+            char **buf, int *pbuf_type)
-            int * pbuf_type)
 {
        int rc = -EACCES;
        READ_REQ *pSMB = NULL;
@@ -1298,8 +1387,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 */
@@ -1316,28 +1405,28 @@ 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 */
-                struct smb_com_readx_req * pSMBW =
+                struct smb_com_readx_req *pSMBW =
                        (struct smb_com_readx_req *)pSMB;
                pSMBW->ByteCount = 0;
        }
        iov[0].iov_base = (char *)pSMB;
        iov[0].iov_len = pSMB->hdr.smb_buf_length + 4;
-        rc = SendReceive2(xid, tcon->ses, iov, 
+        rc = SendReceive2(xid, tcon->ses, iov,
                          1 /* num iovecs */,
-                          &resp_buf_type, 0); 
+                          &resp_buf_type, 0);
        cifs_stats_inc(&tcon->num_reads);
        pSMBr = (READ_RSP *)iov[0].iov_base;
        if (rc) {
@@ -1351,33 +1440,34 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon,
                /*check that DataLength would not go beyond end of SMB */
                if ((data_length > CIFSMaxBufSize)
                                || (data_length > count)) {
-                        cFYI(1,("bad length %d for count %d",data_length,count));
+                        cFYI(1, ("bad length %d for count %d",
+                                 data_length, count));
                        rc = -EIO;
                        *nbytes = 0;
                } 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));
+                                cERROR(1,("Faulting on read rc = %d",rc));
-                                rc = -EFAULT;
+                                rc = -EFAULT;
                        }*/ /* can not use copy_to_user when using page cache*/
-                        if(*buf)
+                        if (*buf)
-                                memcpy(*buf,pReadData,data_length);
+                                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 */ 
+                /* return buffer to caller to free */
-                *buf = iov[0].iov_base;         
+                *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 */
@@ -1391,7 +1481,7 @@ int
 CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
             const int netfid, const unsigned int count,
             const __u64 offset, unsigned int *nbytes, const char *buf,
-             const char __user * ubuf, const int long_op)
+             const char __user *ubuf, const int long_op)
 {
        int rc = -EACCES;
        WRITE_REQ *pSMB = NULL;
@@ -1401,10 +1491,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;
@@ -1420,20 +1510,20 @@ 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;
        pSMB->WriteMode = 0;
        pSMB->Remaining = 0;
-        /* Can increase buffer size if buffer is big enough in some cases - ie we 
+        /* Can increase buffer size if buffer is big enough in some cases ie we
        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)
@@ -1443,11 +1533,11 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        if (bytes_sent > count)
                bytes_sent = count;
        pSMB->DataOffset =
-                cpu_to_le16(offsetof(struct smb_com_write_req,Data) - 4);
+                cpu_to_le16(offsetof(struct smb_com_write_req, Data) - 4);
-        if(buf)
+        if (buf)
-            memcpy(pSMB->Data,buf,bytes_sent);
+            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;
                }
@@ -1456,7 +1546,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 */
@@ -1465,10 +1555,11 @@ 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  */
+        else { /* old style write has byte count 4 bytes earlier
-                struct smb_com_writex_req * pSMBW = 
+                  so 4 bytes pad  */
+                struct smb_com_writex_req *pSMBW =
                        (struct smb_com_writex_req *)pSMB;
                pSMBW->ByteCount = cpu_to_le16(byte_count);
        }
@@ -1487,7 +1578,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
        cifs_buf_release(pSMB);
-        /* Note: On -EAGAIN error only caller can retry on handle based calls 
+        /* Note: On -EAGAIN error only caller can retry on handle based calls
                since file handle passed in no longer valid */
        return rc;
@@ -1505,9 +1596,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;
@@ -1521,37 +1612,37 @@ 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;
        pSMB->Remaining = 0;
        pSMB->DataOffset =
-            cpu_to_le16(offsetof(struct smb_com_write_req,Data) - 4);
+            cpu_to_le16(offsetof(struct smb_com_write_req, Data) - 4);
        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 =
+                struct smb_com_writex_req *pSMBW =
                                (struct smb_com_writex_req *)pSMB;
                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;
-        
        rc = SendReceive2(xid, tcon->ses, iov, n_vec + 1, &resp_buf_type,
                          long_op);
@@ -1559,7 +1650,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;
@@ -1568,15 +1659,15 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
                *nbytes = le16_to_cpu(pSMBr->CountHigh);
                *nbytes = (*nbytes) << 16;
                *nbytes += le16_to_cpu(pSMBr->Count);
-        } 
+        }
 /*      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 
+        /* Note: On -EAGAIN error only caller can retry on handle based calls
                since file handle passed in no longer valid */
        return rc;
@@ -1596,7 +1687,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
        int timeout = 0;
        __u16 count;
-        cFYI(1, ("In CIFSSMBLock - timeout %d numLock %d",waitFlag,numLock));
+        cFYI(1, ("In CIFSSMBLock - timeout %d numLock %d", waitFlag, numLock));
        rc = small_smb_init(SMB_COM_LOCKING_ANDX, 8, tcon, (void **) &pSMB);
        if (rc)
@@ -1604,7 +1695,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) {
@@ -1620,7 +1711,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);
@@ -1648,7 +1739,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
        }
        cifs_small_buf_release(pSMB);
-        /* Note: On -EAGAIN error only caller can retry on handle based calls 
+        /* Note: On -EAGAIN error only caller can retry on handle based calls
        since file handle passed in no longer valid */
        return rc;
 }
@@ -1656,12 +1747,11 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon,
 int
 CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
                const __u16 smb_file_id, const int get_flag, const __u64 len,
-                struct file_lock *pLockData, const __u16 lock_type, 
+                struct file_lock *pLockData, const __u16 lock_type,
                const int waitFlag)
 {
        struct smb_com_transaction2_sfi_req *pSMB  = NULL;
        struct smb_com_transaction2_sfi_rsp *pSMBr = NULL;
-        char *data_offset;
        struct cifs_posix_lock *parm_data;
        int rc = 0;
        int timeout = 0;
@@ -1670,7 +1760,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);
@@ -1680,7 +1770,7 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
        pSMBr = (struct smb_com_transaction2_sfi_rsp *)pSMB;
-        params = 6; 
+        params = 6;
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
        pSMB->Flags = 0;
@@ -1688,14 +1778,12 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
        param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
        offset = param_offset + params;
-        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
        count = sizeof(struct cifs_posix_lock);
        pSMB->MaxParameterCount = cpu_to_le16(2);
        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);
@@ -1705,11 +1793,11 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
        pSMB->TotalDataCount = pSMB->DataCount;
        pSMB->TotalParameterCount = pSMB->ParameterCount;
        pSMB->ParameterOffset = cpu_to_le16(param_offset);
-        parm_data = (struct cifs_posix_lock *) 
+        parm_data = (struct cifs_posix_lock *)
                        (((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);
@@ -1746,22 +1834,22 @@ 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;
        }
- 
 plk_err_exit:
        if (pSMB)
                cifs_small_buf_release(pSMB);
@@ -1784,7 +1872,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;
@@ -1798,7 +1886,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));
                }
@@ -1807,7 +1895,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;
@@ -1839,7 +1927,7 @@ renameRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName, 
+                    cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -1851,7 +1939,7 @@ renameRetry:
                                     toName, PATH_MAX, nls_codepage, remap);
                name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                name_len2 *= 2; /* convert to bytes */
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fromName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->OldFileName, fromName, name_len);
@@ -1872,7 +1960,7 @@ renameRetry:
        cifs_stats_inc(&tcon->num_renames);
        if (rc) {
                cFYI(1, ("Send error in rename = %d", rc));
-        } 
+        }
        cifs_buf_release(pSMB);
@@ -1882,13 +1970,13 @@ renameRetry:
        return rc;
 }
-int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon, 
+int CIFSSMBRenameOpenFile(const int xid, struct cifsTconInfo *pTcon,
-                int netfid, char * target_name, 
+                int netfid, char *target_name,
-                const struct nls_table * nls_codepage, int remap)
+                const struct nls_table *nls_codepage, int remap)
 {
        struct smb_com_transaction2_sfi_req *pSMB  = NULL;
        struct smb_com_transaction2_sfi_rsp *pSMBr = NULL;
-        struct set_file_rename * rename_info;
+        struct set_file_rename *rename_info;
        char *data_offset;
        char dummy_string[30];
        int rc = 0;
@@ -1927,13 +2015,14 @@ 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);
+                sprintf(dummy_string, "cifs%x", pSMB->hdr.Mid);
-                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
+                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
                                        dummy_string, 24, nls_codepage, remap);
        } else {
                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
-                                        target_name, PATH_MAX, nls_codepage, remap);
+                                        target_name, PATH_MAX, nls_codepage,
+                                        remap);
        }
        rename_info->target_name_len = cpu_to_le32(2 * len_of_str);
        count = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str) + 2;
@@ -1947,10 +2036,10 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
        pSMB->hdr.smb_buf_length += byte_count;
        pSMB->ByteCount = cpu_to_le16(byte_count);
        rc = SendReceive(xid, pTcon->ses, (struct smb_hdr *) pSMB,
-                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
+                         (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);
@@ -1962,9 +2051,9 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon,
 }
 int
-CIFSSMBCopy(const int xid, struct cifsTconInfo *tcon, const char * fromName, 
+CIFSSMBCopy(const int xid, struct cifsTconInfo *tcon, const char *fromName,
-            const __u16 target_tid, const char *toName, const int flags,
+            const __u16 target_tid, const char *toName, const int flags,
-            const struct nls_table *nls_codepage, int remap)
+            const struct nls_table *nls_codepage, int remap)
 {
        int rc = 0;
        COPY_REQ *pSMB = NULL;
@@ -1986,7 +2075,7 @@ copyRetry:
        pSMB->Flags = cpu_to_le16(flags & COPY_TREE);
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->OldFileName, 
+                name_len = cifsConvertToUCS((__le16 *) pSMB->OldFileName,
                                            fromName, PATH_MAX, nls_codepage,
                                            remap);
                name_len++;     /* trailing null */
@@ -1994,11 +2083,12 @@ copyRetry:
                pSMB->OldFileName[name_len] = 0x04;     /* pad */
                /* protocol requires ASCII signature byte on Unicode string */
                pSMB->OldFileName[name_len + 1] = 0x00;
-                name_len2 = cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2], 
+                name_len2 =
+                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
                                toName, PATH_MAX, nls_codepage, remap);
                name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                name_len2 *= 2; /* convert to bytes */
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fromName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->OldFileName, fromName, name_len);
@@ -2058,7 +2148,7 @@ createSymLinkRetry:
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fromName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, fromName, name_len);
@@ -2070,7 +2160,7 @@ createSymLinkRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
@@ -2081,7 +2171,7 @@ createSymLinkRetry:
                                  , nls_codepage);
                name_len_target++;      /* trailing null */
                name_len_target *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len_target = strnlen(toName, PATH_MAX);
                name_len_target++;      /* trailing null */
                strncpy(data_offset, toName, name_len_target);
@@ -2108,9 +2198,7 @@ createSymLinkRetry:
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&tcon->num_symlinks);
        if (rc) {
-                cFYI(1,
+                cFYI(1, ("Send error in SetPathInfo create symlink = %d", rc));
-                     ("Send error in SetPathInfo (create symlink) = %d",
-                      rc));
        }
        if (pSMB)
@@ -2149,7 +2237,7 @@ createHardLinkRetry:
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(toName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, toName, name_len);
@@ -2161,7 +2249,7 @@ createHardLinkRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
@@ -2171,7 +2259,7 @@ createHardLinkRetry:
                                     nls_codepage, remap);
                name_len_target++;      /* trailing null */
                name_len_target *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len_target = strnlen(fromName, PATH_MAX);
                name_len_target++;      /* trailing null */
                strncpy(data_offset, fromName, name_len_target);
@@ -2243,13 +2331,13 @@ winCreateHardLinkRetry:
                name_len++;     /* trailing null */
                name_len *= 2;
                pSMB->OldFileName[name_len] = 0;        /* pad */
-                pSMB->OldFileName[name_len + 1] = 0x04; 
+                pSMB->OldFileName[name_len + 1] = 0x04;
                name_len2 =
-                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2], 
+                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
                                     toName, PATH_MAX, nls_codepage, remap);
                name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                name_len2 *= 2; /* convert to bytes */
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fromName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->OldFileName, fromName, name_len);
@@ -2302,12 +2390,11 @@ querySymLinkRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifs_strtoUCS((__le16 *) pSMB->FileName, searchName, PATH_MAX
+                    cifs_strtoUCS((__le16 *) pSMB->FileName, searchName,
-                                  /* find define for this maxpathcomponent */
+                                  PATH_MAX, nls_codepage);
-                                  , nls_codepage);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
@@ -2324,7 +2411,7 @@ querySymLinkRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+        struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -2355,16 +2442,16 @@ querySymLinkRetry:
                        if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) {
                                name_len = UniStrnlen((wchar_t *) ((char *)
-                                        &pSMBr->hdr.Protocol +data_offset),
+                                        &pSMBr->hdr.Protocol + data_offset),
-                                        min_t(const int, buflen,count) / 2);
+                                        min_t(const int, buflen, count) / 2);
                        /* BB FIXME investigate remapping reserved chars here */
                                cifs_strfromUCS_le(symlinkinfo,
-                                        (__le16 *) ((char *)&pSMBr->hdr.Protocol +
+                                        (__le16 *) ((char *)&pSMBr->hdr.Protocol
-                                                data_offset),
+                                                        + data_offset),
                                        name_len, nls_codepage);
                        } else {
                                strncpy(symlinkinfo,
-                                        (char *) &pSMBr->hdr.Protocol + 
+                                        (char *) &pSMBr->hdr.Protocol +
                                                data_offset,
                                        min_t(const int, buflen, count));
                        }
@@ -2385,14 +2472,14 @@ querySymLinkRetry:
        Setup words themselves and ByteCount
        MaxSetupCount (size of returned setup area) and
        MaxParameterCount (returned parms size) must be set by caller */
-static int 
+static int
 smb_init_ntransact(const __u16 sub_command, const int setup_count,
                   const int parm_len, struct cifsTconInfo *tcon,
-                   void ** ret_buf)
+                   void **ret_buf)
 {
        int rc;
        __u32 temp_offset;
-        struct smb_com_ntransact_req * pSMB;
+        struct smb_com_ntransact_req *pSMB;
        rc = small_smb_init(SMB_COM_NT_TRANSACT, 19 + setup_count, tcon,
                                (void **)&pSMB);
@@ -2416,47 +2503,47 @@ smb_init_ntransact(const __u16 sub_command, const int setup_count,
 }
 static int
-validate_ntransact(char * buf, char ** ppparm, char ** ppdata,
+validate_ntransact(char *buf, char **ppparm, char **ppdata,
-                   int * pdatalen, int * pparmlen)
+                   int *pdatalen, int *pparmlen)
 {
-        char * end_of_smb;
+        char *end_of_smb;
        __u32 data_count, data_offset, parm_count, parm_offset;
-        struct smb_com_ntransact_rsp * pSMBr;
+        struct smb_com_ntransact_rsp *pSMBr;
-        if(buf == NULL)
+        if (buf == NULL)
                return -EINVAL;
        pSMBr = (struct smb_com_ntransact_rsp *)buf;
        /* ByteCount was converted from little endian in SendReceive */
-        end_of_smb = 2 /* sizeof byte count */ + pSMBr->ByteCount + 
+        end_of_smb = 2 /* sizeof byte count */ + pSMBr->ByteCount +
                        (char *)&pSMBr->ByteCount;
-                
        data_offset = le32_to_cpu(pSMBr->DataOffset);
        data_count = le32_to_cpu(pSMBr->DataCount);
-        parm_offset = le32_to_cpu(pSMBr->ParameterOffset);
+        parm_offset = le32_to_cpu(pSMBr->ParameterOffset);
        parm_count = le32_to_cpu(pSMBr->ParameterCount);
        *ppparm = (char *)&pSMBr->hdr.Protocol + parm_offset;
        *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 */
+                        *ppdata, data_count, (data_count + *ppdata),
+                        end_of_smb, pSMBr));
                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;
@@ -2465,14 +2552,14 @@ validate_ntransact(char * buf, char ** ppparm, char ** ppdata,
 int
 CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon,
                        const unsigned char *searchName,
-                        char *symlinkinfo, const int buflen,__u16 fid,
+                        char *symlinkinfo, const int buflen, __u16 fid,
                        const struct nls_table *nls_codepage)
 {
        int rc = 0;
        int bytes_returned;
        int name_len;
-        struct smb_com_transaction_ioctl_req * pSMB;
+        struct smb_com_transaction_ioctl_req *pSMB;
-        struct smb_com_transaction_ioctl_rsp * pSMBr;
+        struct smb_com_transaction_ioctl_rsp *pSMBr;
        cFYI(1, ("In Windows reparse style QueryLink for path %s", searchName));
        rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB,
@@ -2511,47 +2598,53 @@ 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 */ +
+                                char *end_of_smb = 2 /* sizeof byte count */ +
                                                pSMBr->ByteCount +
                                                (char *)&pSMBr->ByteCount;
-                                struct reparse_data * reparse_buf = (struct reparse_data *)
+                                struct reparse_data *reparse_buf =
-                                        ((char *)&pSMBr->hdr.Protocol + data_offset);
+                                                (struct reparse_data *)
-                                if((char*)reparse_buf >= end_of_smb) {
+                                                ((char *)&pSMBr->hdr.Protocol
+                                                                 + data_offset);
+                                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) {
-                                        cFYI(1,("reparse buf extended beyond SMB"));
+                                        cFYI(1,("reparse buf goes beyond SMB"));
                                        rc = -EIO;
                                        goto qreparse_out;
                                }
-                                
                                if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) {
                                        name_len = UniStrnlen((wchar_t *)
-                                                        (reparse_buf->LinkNamesBuf + 
+                                                (reparse_buf->LinkNamesBuf +
-                                                        reparse_buf->TargetNameOffset),
+                                                reparse_buf->TargetNameOffset),
-                                                        min(buflen/2, reparse_buf->TargetNameLen / 2)); 
+                                                min(buflen/2,
+                                                reparse_buf->TargetNameLen / 2));
                                        cifs_strfromUCS_le(symlinkinfo,
-                                                (__le16 *) (reparse_buf->LinkNamesBuf + 
+                                                (__le16 *) (reparse_buf->LinkNamesBuf +
                                                reparse_buf->TargetNameOffset),
                                                name_len, nls_codepage);
                                } else { /* ASCII names */
-                                        strncpy(symlinkinfo,reparse_buf->LinkNamesBuf + 
+                                        strncpy(symlinkinfo,
-                                                reparse_buf->TargetNameOffset, 
+                                                reparse_buf->LinkNamesBuf +
-                                                min_t(const int, buflen, reparse_buf->TargetNameLen));
+                                                reparse_buf->TargetNameOffset,
+                                                min_t(const int, buflen,
+                                                   reparse_buf->TargetNameLen));
                                }
                        } else {
                                rc = -EIO;
-                                cFYI(1,("Invalid return data count on get reparse info ioctl"));
+                                cFYI(1, ("Invalid return data count on "
+                                         "get reparse info ioctl"));
                        }
                        symlinkinfo[buflen] = 0; /* just in case so the caller
                                        does not go off the end of the buffer */
-                        cFYI(1,("readlink result - %s",symlinkinfo));
+                        cFYI(1, ("readlink result - %s", symlinkinfo));
                }
        }
 qreparse_out:
@@ -2566,7 +2659,8 @@ qreparse_out:
 #ifdef CONFIG_CIFS_POSIX
 /*Convert an Access Control Entry from wire format to local POSIX xattr format*/
-static void cifs_convert_ace(posix_acl_xattr_entry * ace, struct cifs_posix_ace * cifs_ace)
+static void cifs_convert_ace(posix_acl_xattr_entry *ace,
+                             struct cifs_posix_ace *cifs_ace)
 {
        /* u8 cifs fields do not need le conversion */
        ace->e_perm = cpu_to_le16(cifs_ace->cifs_e_perm);
@@ -2578,30 +2672,31 @@ static void cifs_convert_ace(posix_acl_xattr_entry * ace, struct cifs_posix_ace
 }
 /* Convert ACL from CIFS POSIX wire format to local Linux POSIX ACL xattr */
-static int cifs_copy_posix_acl(char * trgt,char * src, const int buflen,
+static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen,
-                                const int acl_type,const int size_of_data_area)
+                               const int acl_type, const int size_of_data_area)
 {
        int size =  0;
        int i;
        __u16 count;
-        struct cifs_posix_ace * pACE;
+        struct cifs_posix_ace *pACE;
-        struct cifs_posix_acl * cifs_acl = (struct cifs_posix_acl *)src;
+        struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)src;
-        posix_acl_xattr_header * local_acl = (posix_acl_xattr_header *)trgt;
+        posix_acl_xattr_header *local_acl = (posix_acl_xattr_header *)trgt;
        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));
+                        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;
@@ -2610,7 +2705,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 */
@@ -2618,76 +2713,77 @@ 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 */                         
+                /* 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);
-                for(i = 0;i < count ;i++) {
+                for (i = 0; i < count ; i++) {
-                        cifs_convert_ace(&local_acl->a_entries[i],pACE);
+                        cifs_convert_ace(&local_acl->a_entries[i], pACE);
-                        pACE ++;
+                        pACE++;
                }
        }
        return size;
 }
-static __u16 convert_ace_to_cifs_ace(struct cifs_posix_ace * cifs_ace,
+static __u16 convert_ace_to_cifs_ace(struct cifs_posix_ace *cifs_ace,
-                        const posix_acl_xattr_entry * local_ace)
+                                     const posix_acl_xattr_entry *local_ace)
 {
        __u16 rc = 0; /* 0 = ACL converted ok */
        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 
+        } else
                cifs_ace->cifs_uid = cpu_to_le64(le32_to_cpu(local_ace->e_id));
-        /*cFYI(1,("perm %d tag %d id %d",ace->e_perm,ace->e_tag,ace->e_id));*/
+        /*cFYI(1,("perm %d tag %d id %d",ace->e_perm,ace->e_tag,ace->e_id));*/
        return rc;
 }
 /* Convert ACL from local Linux POSIX xattr to CIFS POSIX ACL wire format */
-static __u16 ACL_to_cifs_posix(char * parm_data,const char * pACL,const int buflen,
+static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,
-                const int acl_type)
+                               const int buflen, const int acl_type)
 {
        __u16 rc = 0;
-        struct cifs_posix_acl * cifs_acl = (struct cifs_posix_acl *)parm_data;
+        struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)parm_data;
-        posix_acl_xattr_header * local_acl = (posix_acl_xattr_header *)pACL;
+        posix_acl_xattr_header *local_acl = (posix_acl_xattr_header *)pACL;
        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",
+        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",
+                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));
+                cFYI(1, ("unknown ACL type %d", acl_type));
                return 0;
        }
-        for(i=0;i<count;i++) {
+        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 */
@@ -2697,9 +2793,9 @@ static __u16 ACL_to_cifs_posix(char * parm_data,const char * pACL,const int bufl
 int
 CIFSSMBGetPosixACL(const int xid, struct cifsTconInfo *tcon,
-                        const unsigned char *searchName,
+                   const unsigned char *searchName,
-                        char *acl_inf, const int buflen, const int acl_type,
+                   char *acl_inf, const int buflen, const int acl_type,
-                        const struct nls_table *nls_codepage, int remap)
+                   const struct nls_table *nls_codepage, int remap)
 {
 /* SMB_QUERY_POSIX_ACL */
        TRANSACTION2_QPI_REQ *pSMB = NULL;
@@ -2708,7 +2804,7 @@ CIFSSMBGetPosixACL(const int xid, struct cifsTconInfo *tcon,
        int bytes_returned;
        int name_len;
        __u16 params, byte_count;
-                                                                                                                                             
        cFYI(1, ("In GetPosixACL (Unix) for path %s", searchName));
 queryAclRetry:
@@ -2716,16 +2812,16 @@ queryAclRetry:
                (void **) &pSMBr);
        if (rc)
                return rc;
-                                                                                                                                             
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, 
+                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
                                         PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
                pSMB->FileName[name_len] = 0;
                pSMB->FileName[name_len+1] = 0;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
@@ -2734,7 +2830,7 @@ queryAclRetry:
        params = 2 /* level */  + 4 /* rsrvd */  + name_len /* incl null */ ;
        pSMB->TotalDataCount = 0;
        pSMB->MaxParameterCount = cpu_to_le16(2);
-        /* BB find exact max data count below from sess structure BB */
+        /* BB find exact max data count below from sess structure BB */
        pSMB->MaxDataCount = cpu_to_le16(4000);
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
@@ -2742,7 +2838,8 @@ queryAclRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(
-                offsetof(struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+                offsetof(struct smb_com_transaction2_qpi_req,
+                         InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -2763,7 +2860,7 @@ queryAclRetry:
                cFYI(1, ("Send error in Query POSIX ACL = %d", rc));
        } else {
                /* decode response */
- 
                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
                if (rc || (pSMBr->ByteCount < 2))
                /* BB also check enough total bytes returned */
@@ -2773,7 +2870,7 @@ queryAclRetry:
                        __u16 count = le16_to_cpu(pSMBr->t2.DataCount);
                        rc = cifs_copy_posix_acl(acl_inf,
                                (char *)&pSMBr->hdr.Protocol+data_offset,
-                                buflen,acl_type,count);
+                                buflen, acl_type, count);
                }
        }
        cifs_buf_release(pSMB);
@@ -2784,10 +2881,10 @@ queryAclRetry:
 int
 CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
-                        const unsigned char *fileName,
+                   const unsigned char *fileName,
-                        const char *local_acl, const int buflen, 
+                   const char *local_acl, const int buflen,
-                        const int acl_type,
+                   const int acl_type,
-                        const struct nls_table *nls_codepage, int remap)
+                   const struct nls_table *nls_codepage, int remap)
 {
        struct smb_com_transaction2_spi_req *pSMB = NULL;
        struct smb_com_transaction2_spi_rsp *pSMBr = NULL;
@@ -2800,16 +2897,16 @@ CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
        cFYI(1, ("In SetPosixACL (Unix) for path %s", fileName));
 setAclRetry:
        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
-                      (void **) &pSMBr);
+                      (void **) &pSMBr);
        if (rc)
                return rc;
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, 
+                        cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
                                      PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fileName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, fileName, name_len);
@@ -2823,15 +2920,15 @@ setAclRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        parm_data = ((char *) &pSMB->hdr.Protocol) + offset;
        pSMB->ParameterOffset = cpu_to_le16(param_offset);
        /* convert to on the wire format for POSIX ACL */
-        data_count = ACL_to_cifs_posix(parm_data,local_acl,buflen,acl_type);
+        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;
        }
@@ -2849,7 +2946,7 @@ setAclRetry:
        pSMB->hdr.smb_buf_length += byte_count;
        pSMB->ByteCount = cpu_to_le16(byte_count);
        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) {
                cFYI(1, ("Set POSIX ACL returned %d", rc));
        }
@@ -2864,86 +2961,85 @@ setACLerrorExit:
 /* BB fix tabs in this function FIXME BB */
 int
 CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
-                const int netfid, __u64 * pExtAttrBits, __u64 *pMask)
+               const int netfid, __u64 * pExtAttrBits, __u64 *pMask)
 {
-        int rc = 0;
+        int rc = 0;
-        struct smb_t2_qfi_req *pSMB = NULL;
+        struct smb_t2_qfi_req *pSMB = NULL;
-        struct smb_t2_qfi_rsp *pSMBr = NULL;
+        struct smb_t2_qfi_rsp *pSMBr = NULL;
-        int bytes_returned;
+        int bytes_returned;
-        __u16 params, byte_count;
+        __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 */
@@ -2955,7 +3051,7 @@ static const struct cifs_sid sid_user =
                {1, 2 , {0, 0, 0, 0, 0, 5}, {32, 545, 0, 0}};
 /* Convert CIFS ACL to POSIX form */
-static int parse_sec_desc(struct cifs_sid * psec_desc, int acl_len)
+static int parse_sec_desc(struct cifs_sid *psec_desc, int acl_len)
 {
        return 0;
 }
@@ -2963,7 +3059,7 @@ static int parse_sec_desc(struct cifs_sid * psec_desc, int acl_len)
 /* Get Security Descriptor (by handle) from remote server for a file or dir */
 int
 CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
-         /*  BB fix up return info */ char *acl_inf, const int buflen, 
+                /* BB fix up return info */ char *acl_inf, const int buflen,
                  const int acl_type /* ACCESS/DEFAULT not sure implication */)
 {
        int rc = 0;
@@ -2973,7 +3069,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
        cFYI(1, ("GetCifsACL"));
-        rc = smb_init_ntransact(NT_TRANSACT_QUERY_SECURITY_DESC, 0, 
+        rc = smb_init_ntransact(NT_TRANSACT_QUERY_SECURITY_DESC, 0,
                        8 /* parm len */, tcon, (void **) &pSMB);
        if (rc)
                return rc;
@@ -2994,23 +3090,23 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
        if (rc) {
                cFYI(1, ("Send error in QuerySecDesc = %d", rc));
        } else {                /* decode response */
-                struct cifs_sid * psec_desc;
+                struct cifs_sid *psec_desc;
                __le32 * parm;
                int parm_len;
                int data_len;
                int acl_len;
-                struct smb_com_ntransact_rsp * pSMBr;
+                struct smb_com_ntransact_rsp *pSMBr;
 /* validate_nttransact */
-                rc = validate_ntransact(iov[0].iov_base, (char **)&parm, 
+                rc = validate_ntransact(iov[0].iov_base, (char **)&parm,
                                        (char **)&psec_desc,
                                        &parm_len, &data_len);
-                
+                if (rc)
-                if(rc)
                        goto qsec_out;
                pSMBr = (struct smb_com_ntransact_rsp *)iov[0].iov_base;
-                cERROR(1,("smb %p parm %p data %p",pSMBr,parm,psec_desc));  /* BB removeme BB */
+                cERROR(1, ("smb %p parm %p data %p",
+                          pSMBr, parm, psec_desc));  /* BB removeme BB */
                if (le32_to_cpu(pSMBr->ParameterCount) != 4) {
                        rc = -EIO;      /* bad smb */
@@ -3020,14 +3116,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;
@@ -3036,9 +3132,9 @@ qsec_out:
 /* Legacy Query Path Information call for lookup to old servers such
   as Win9x/WinME */
 int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon,
-                 const unsigned char *searchName,
+                        const unsigned char *searchName,
-                 FILE_ALL_INFO * pFinfo,
+                        FILE_ALL_INFO *pFinfo,
-                 const struct nls_table *nls_codepage, int remap)
+                        const struct nls_table *nls_codepage, int remap)
 {
        QUERY_INFORMATION_REQ * pSMB;
        QUERY_INFORMATION_RSP * pSMBr;
@@ -3046,31 +3142,31 @@ int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon,
        int bytes_returned;
        int name_len;
-        cFYI(1, ("In SMBQPath path %s", searchName)); 
+        cFYI(1, ("In SMBQPath path %s", searchName));
 QInfRetry:
        rc = smb_init(SMB_COM_QUERY_INFORMATION, 0, tcon, (void **) &pSMB,
-                      (void **) &pSMBr);
+                      (void **) &pSMBr);
        if (rc)
                return rc;
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
+                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                     PATH_MAX, nls_codepage, remap);
+                                        PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {               
+        } else {
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
        }
        pSMB->BufferFormat = 0x04;
-        name_len++; /* account for buffer type byte */  
+        name_len++; /* account for buffer type byte */
        pSMB->hdr.smb_buf_length += (__u16) name_len;
        pSMB->ByteCount = cpu_to_le16(name_len);
        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) {
                cFYI(1, ("Send error in QueryInfo = %d", rc));
        } else if (pFinfo) {            /* decode response */
@@ -3127,17 +3223,17 @@ QPathInfoRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, 
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
        }
-        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */ ;
+        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
        pSMB->TotalDataCount = 0;
        pSMB->MaxParameterCount = cpu_to_le16(2);
        pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */
@@ -3147,7 +3243,7 @@ QPathInfoRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+        struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -3156,7 +3252,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);
@@ -3173,16 +3269,18 @@ QPathInfoRetry:
                if (rc) /* BB add auto retry on EOPNOTSUPP? */
                        rc = -EIO;
-                else if (!legacy && (pSMBr->ByteCount < 40)) 
+                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 */
+                        rc = -EIO;  /* 24 or 26 expected but we do not read
-                else if (pFindData){
+                                        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);
@@ -3226,24 +3324,24 @@ UnixQPathInfoRetry:
                                  PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
        }
-        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */ ;
+        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
        pSMB->TotalDataCount = 0;
        pSMB->MaxParameterCount = cpu_to_le16(2);
        /* BB find exact max SMB PDU from sess structure BB */
-        pSMB->MaxDataCount = cpu_to_le16(4000); 
+        pSMB->MaxDataCount = cpu_to_le16(4000);
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
        pSMB->Flags = 0;
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+        struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -3303,12 +3401,11 @@ findUniqueRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, PATH_MAX
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                  /* find define for this maxpathcomponent */
+                                     PATH_MAX, nls_codepage);
-                                  , nls_codepage);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
@@ -3324,7 +3421,7 @@ findUniqueRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(
-         offsetof(struct smb_com_transaction2_ffirst_req,InformationLevel) - 4);
+         offsetof(struct smb_com_transaction2_ffirst_req, InformationLevel)-4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;   /* one byte, no need to le convert */
@@ -3364,10 +3461,10 @@ findUniqueRetry:
 /* xid, tcon, searchName and codepage are input parms, rest are returned */
 int
 CIFSFindFirst(const int xid, struct cifsTconInfo *tcon,
-              const char *searchName, 
+              const char *searchName,
              const struct nls_table *nls_codepage,
-              __u16 *   pnetfid,
+              __u16 *pnetfid,
-              struct cifs_search_info * psrch_inf, int remap, const char dirsep)
+              struct cifs_search_info *psrch_inf, int remap, const char dirsep)
 {
 /* level 257 SMB_ */
        TRANSACTION2_FFIRST_REQ *pSMB = NULL;
@@ -3378,7 +3475,7 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon,
        int name_len;
        __u16 params, byte_count;
-        cFYI(1, ("In FindFirst for %s",searchName));
+        cFYI(1, ("In FindFirst for %s", searchName));
 findFirstRetry:
        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
@@ -3388,7 +3485,7 @@ findFirstRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName,searchName,
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
                                 PATH_MAX, nls_codepage, remap);
                /* We can not add the asterik earlier in case
                it got remapped to 0xF03A as if it were part of the
@@ -3405,7 +3502,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;
@@ -3438,8 +3535,8 @@ findFirstRetry:
        pSMB->SearchAttributes =
            cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM |
                        ATTR_DIRECTORY);
-        pSMB->SearchCount= cpu_to_le16(CIFSMaxBufSize/sizeof(FILE_UNIX_INFO));
+        pSMB->SearchCount = cpu_to_le16(CIFSMaxBufSize/sizeof(FILE_UNIX_INFO));
-        pSMB->SearchFlags = cpu_to_le16(CIFS_SEARCH_CLOSE_AT_END | 
+        pSMB->SearchFlags = cpu_to_le16(CIFS_SEARCH_CLOSE_AT_END |
                CIFS_SEARCH_RETURN_RESUME);
        pSMB->InformationLevel = cpu_to_le16(psrch_inf->info_level);
@@ -3466,7 +3563,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
@@ -3474,18 +3571,19 @@ findFirstRetry:
                        psrch_inf->ntwrk_buf_start = (char *)pSMBr;
                        psrch_inf->smallBuf = 0;
-                        psrch_inf->srch_entries_start = 
+                        psrch_inf->srch_entries_start =
-                                (char *) &pSMBr->hdr.Protocol + 
+                                (char *) &pSMBr->hdr.Protocol +
                                        le16_to_cpu(pSMBr->t2.DataOffset);
                        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;
-                        psrch_inf->entries_in_buffer  = le16_to_cpu(parms->SearchCount);
+                        psrch_inf->entries_in_buffer =
+                                        le16_to_cpu(parms->SearchCount);
                        psrch_inf->index_of_last_entry = 2 /* skip . and .. */ +
                                psrch_inf->entries_in_buffer;
                        *pnetfid = parms->SearchHandle;
@@ -3498,7 +3596,7 @@ findFirstRetry:
 }
 int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
-            __u16 searchHandle, struct cifs_search_info * psrch_inf)
+                 __u16 searchHandle, struct cifs_search_info *psrch_inf)
 {
        TRANSACTION2_FNEXT_REQ *pSMB = NULL;
        TRANSACTION2_FNEXT_RSP *pSMBr = NULL;
@@ -3510,7 +3608,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,
@@ -3518,12 +3616,13 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        if (rc)
                return rc;
-        params = 14;    /* includes 2 bytes of null string, converted to LE below */
+        params = 14; /* includes 2 bytes of null string, converted to LE below*/
        byte_count = 0;
        pSMB->TotalDataCount = 0;       /* no EAs */
        pSMB->MaxParameterCount = cpu_to_le16(8);
        pSMB->MaxDataCount =
-            cpu_to_le16((tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFF00);
+                cpu_to_le16((tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) &
+                                0xFFFFFF00);
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
        pSMB->Flags = 0;
@@ -3539,15 +3638,6 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        pSMB->SearchHandle = searchHandle;      /* always kept as le */
        pSMB->SearchCount =
                cpu_to_le16(CIFSMaxBufSize / sizeof (FILE_UNIX_INFO));
-        /* test for Unix extensions */
-/*      if (tcon->ses->capabilities & CAP_UNIX) {
-                pSMB->InformationLevel = cpu_to_le16(SMB_FIND_FILE_UNIX);
-                psrch_inf->info_level = SMB_FIND_FILE_UNIX;
-        } else {
-                pSMB->InformationLevel =
-                   cpu_to_le16(SMB_FIND_FILE_DIRECTORY_INFO);
-                psrch_inf->info_level = SMB_FIND_FILE_DIRECTORY_INFO;
-        } */
        pSMB->InformationLevel = cpu_to_le16(psrch_inf->info_level);
        pSMB->ResumeKey = psrch_inf->resume_key;
        pSMB->SearchFlags =
@@ -3555,7 +3645,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 */
@@ -3570,20 +3660,20 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        pSMB->ParameterCount = pSMB->TotalParameterCount;
        pSMB->hdr.smb_buf_length += byte_count;
        pSMB->ByteCount = cpu_to_le16(byte_count);
-                                                                                              
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                        (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&tcon->num_fnext);
        if (rc) {
                if (rc == -EBADF) {
                        psrch_inf->endOfSearch = TRUE;
-                        rc = 0; /* search probably was closed at end of search above */
+                        rc = 0; /* search probably was closed at end of search*/
                } else
                        cFYI(1, ("FindNext returned = %d", rc));
        } 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;
@@ -3594,7 +3684,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
@@ -3602,15 +3692,16 @@ 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;
-                                                                                              
+                        psrch_inf->entries_in_buffer =
-                        psrch_inf->entries_in_buffer  = le16_to_cpu(parms->SearchCount);
+                                                le16_to_cpu(parms->SearchCount);
                        psrch_inf->index_of_last_entry +=
                                psrch_inf->entries_in_buffer;
-/*  cFYI(1,("fnxt2 entries in buf %d index_of_last %d",psrch_inf->entries_in_buffer,psrch_inf->index_of_last_entry)); */
+/*  cFYI(1,("fnxt2 entries in buf %d index_of_last %d",
+            psrch_inf->entries_in_buffer, psrch_inf->index_of_last_entry)); */
                        /* BB fixme add unlock here */
                }
@@ -3625,12 +3716,12 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
 FNext2_err_exit:
        if (rc != 0)
                cifs_buf_release(pSMB);
-                                                                                              
        return rc;
 }
 int
-CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle)
+CIFSFindClose(const int xid, struct cifsTconInfo *tcon,
+              const __u16 searchHandle)
 {
        int rc = 0;
        FINDCLOSE_REQ *pSMB = NULL;
@@ -3642,7 +3733,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;
@@ -3667,9 +3758,9 @@ CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle
 int
 CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
-                const unsigned char *searchName,
+                      const unsigned char *searchName,
-                __u64 * inode_number,
+                      __u64 * inode_number,
-                const struct nls_table *nls_codepage, int remap)
+                      const struct nls_table *nls_codepage, int remap)
 {
        int rc = 0;
        TRANSACTION2_QPI_REQ *pSMB = NULL;
@@ -3677,24 +3768,23 @@ CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
        int name_len, bytes_returned;
        __u16 params, byte_count;
-        cFYI(1,("In GetSrvInodeNum for %s",searchName));
+        cFYI(1, ("In GetSrvInodeNum for %s", searchName));
-        if(tcon == NULL)
+        if (tcon == NULL)
-                return -ENODEV; 
+                return -ENODEV;
 GetInodeNumberRetry:
        rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
-                      (void **) &pSMBr);
+                      (void **) &pSMBr);
        if (rc)
                return rc;
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                PATH_MAX,nls_codepage, remap);
+                                         PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, searchName, name_len);
@@ -3711,7 +3801,7 @@ GetInodeNumberRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-                struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+                struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -3737,12 +3827,12 @@ GetInodeNumberRetry:
                        /* If rc should we check for EOPNOSUPP and
                        disable the srvino flag? or in caller? */
                        rc = -EIO;      /* bad smb */
-                else {
+                else {
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
                        __u16 count = le16_to_cpu(pSMBr->t2.DataCount);
-                        struct file_internal_info * pfinfo;
+                        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;
@@ -3769,12 +3859,12 @@ CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses,
 /* TRANS2_GET_DFS_REFERRAL */
        TRANSACTION2_GET_DFS_REFER_REQ *pSMB = NULL;
        TRANSACTION2_GET_DFS_REFER_RSP *pSMBr = NULL;
-        struct dfs_referral_level_3 * referrals = NULL;
+        struct dfs_referral_level_3 *referrals = NULL;
        int rc = 0;
        int bytes_returned;
        int name_len;
        unsigned int i;
-        char * temp;
+        char *temp;
        __u16 params, byte_count;
        *number_of_UNC_in_array = 0;
        *targetUNCs = NULL;
@@ -3787,8 +3877,8 @@ getDFSRetry:
                      (void **) &pSMBr);
        if (rc)
                return rc;
-        
-        /* server pointer checked in called function, 
+        /* server pointer checked in called function,
        but should never be null here anyway */
        pSMB->hdr.Mid = GetNextMid(ses->server);
        pSMB->hdr.Tid = ses->ipc_tid;
@@ -3807,19 +3897,19 @@ getDFSRetry:
                                     searchName, PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(searchName, PATH_MAX);
                name_len++;     /* trailing null */
                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;
        }
-        pSMB->hdr.Uid = ses->Suid;
+        pSMB->hdr.Uid = ses->Suid;
        params = 2 /* level */  + name_len /*includes null */ ;
        pSMB->TotalDataCount = 0;
@@ -3833,7 +3923,7 @@ getDFSRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_get_dfs_refer_req, MaxReferralLevel) - 4);
+          struct smb_com_transaction2_get_dfs_refer_req, MaxReferralLevel) - 4);
        pSMB->SetupCount = 1;
        pSMB->Reserved3 = 0;
        pSMB->SubCommand = cpu_to_le16(TRANS2_GET_DFS_REFERRAL);
@@ -3852,74 +3942,87 @@ getDFSRetry:
 /* BB Add logic to parse referrals here */
                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
-                if (rc || (pSMBr->ByteCount < 17))      /* BB also check enough total bytes returned */
+                /* BB Also check if enough total bytes returned? */
+                if (rc || (pSMBr->ByteCount < 17))
                        rc = -EIO;      /* bad smb */
                else {
-                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset); 
+                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
                        __u16 data_count = le16_to_cpu(pSMBr->t2.DataCount);
                        cFYI(1,
-                             ("Decoding GetDFSRefer response.  BCC: %d  Offset %d",
+                            ("Decoding GetDFSRefer response BCC: %d  Offset %d",
                              pSMBr->ByteCount, data_offset));
-                        referrals = 
+                        referrals =
-                            (struct dfs_referral_level_3 *) 
+                            (struct dfs_referral_level_3 *)
                                        (8 /* sizeof start of data block */ +
                                        data_offset +
-                                        (char *) &pSMBr->hdr.Protocol); 
+                                        (char *) &pSMBr->hdr.Protocol);
-                        cFYI(1,("num_referrals: %d dfs flags: 0x%x ... \nfor referral one refer size: 0x%x srv type: 0x%x refer flags: 0x%x ttl: 0x%x",
+                        cFYI(1, ("num_referrals: %d dfs flags: 0x%x ... \n"
-                                le16_to_cpu(pSMBr->NumberOfReferrals),le16_to_cpu(pSMBr->DFSFlags), le16_to_cpu(referrals->ReferralSize),le16_to_cpu(referrals->ServerType),le16_to_cpu(referrals->ReferralFlags),le16_to_cpu(referrals->TimeToLive)));
+                                "for referral one refer size: 0x%x srv "
+                                "type: 0x%x refer flags: 0x%x ttl: 0x%x",
+                                le16_to_cpu(pSMBr->NumberOfReferrals),
+                                le16_to_cpu(pSMBr->DFSFlags),
+                                le16_to_cpu(referrals->ReferralSize),
+                                le16_to_cpu(referrals->ServerType),
+                                le16_to_cpu(referrals->ReferralFlags),
+                                le16_to_cpu(referrals->TimeToLive)));
                        /* BB This field is actually two bytes in from start of
                           data block so we could do safety check that DataBlock
                           begins at address of pSMBr->NumberOfReferrals */
-                        *number_of_UNC_in_array = le16_to_cpu(pSMBr->NumberOfReferrals);
+                        *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 */
                        name_len = 0;
-                        for(i=0;i<*number_of_UNC_in_array;i++) {
+                        for (i = 0; i < *number_of_UNC_in_array; i++) {
                                /* make sure that DfsPathOffset not past end */
-                                __u16 offset = le16_to_cpu(referrals->DfsPathOffset);
+                                __u16 offset =
+                                        le16_to_cpu(referrals->DfsPathOffset);
                                if (offset > data_count) {
-                                        /* if invalid referral, stop here and do 
+                                        /* if invalid referral, stop here and do
                                        not try to copy any more */
                                        *number_of_UNC_in_array = i;
                                        break;
-                                } 
+                                }
                                temp = ((char *)referrals) + offset;
                                if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) {
-                                        name_len += UniStrnlen((wchar_t *)temp,data_count);
+                                        name_len += UniStrnlen((wchar_t *)temp,
+                                                                data_count);
                                } else {
-                                        name_len += strnlen(temp,data_count);
+                                        name_len += strnlen(temp, data_count);
                                }
                                referrals++;
-                                /* BB add check that referral pointer does not fall off end PDU */
+                                /* BB add check that referral pointer does
-                                
+                                   not fall off end PDU */
                        }
                        /* BB add check for name_len bigger than bcc */
-                        *targetUNCs = 
+                        *targetUNCs =
-                                kmalloc(name_len+1+ (*number_of_UNC_in_array),GFP_KERNEL);
+                                kmalloc(name_len+1+(*number_of_UNC_in_array),
-                        if(*targetUNCs == NULL) {
+                                        GFP_KERNEL);
+                        if (*targetUNCs == NULL) {
                                rc = -ENOMEM;
                                goto GetDFSRefExit;
                        }
                        /* copy the ref strings */
-                        referrals =  
+                        referrals = (struct dfs_referral_level_3 *)
-                            (struct dfs_referral_level_3 *) 
+                                        (8 /* sizeof data hdr */ + data_offset +
-                                        (8 /* sizeof data hdr */ +
-                                        data_offset + 
                                        (char *) &pSMBr->hdr.Protocol);
-                        for(i=0;i<*number_of_UNC_in_array;i++) {
+                        for (i = 0; i < *number_of_UNC_in_array; i++) {
-                                temp = ((char *)referrals) + le16_to_cpu(referrals->DfsPathOffset);
+                                temp = ((char *)referrals) +
+                                          le16_to_cpu(referrals->DfsPathOffset);
                                if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) {
                                        cifs_strfromUCS_le(*targetUNCs,
-                                                (__le16 *) temp, name_len, nls_codepage);
+                                                          (__le16 *) temp,
+                                                          name_len,
+                                                          nls_codepage);
                                } else {
-                                        strncpy(*targetUNCs,temp,name_len);
+                                        strncpy(*targetUNCs, temp, name_len);
                                }
                                /*  BB update target_uncs pointers */
                                referrals++;
@@ -3996,18 +4099,17 @@ oldQFSInfoRetry:
                        rc = -EIO;      /* bad smb */
                else {
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
-                        cFYI(1,("qfsinf resp BCC: %d  Offset %d",
+                        cFYI(1, ("qfsinf resp BCC: %d  Offset %d",
                                 pSMBr->ByteCount, data_offset));
-                        response_data =
+                        response_data = (FILE_SYSTEM_ALLOC_INFO *)
-                                (FILE_SYSTEM_ALLOC_INFO *) 
                                (((char *) &pSMBr->hdr.Protocol) + data_offset);
                        FSData->f_bsize =
                                le16_to_cpu(response_data->BytesPerSector) *
                                le32_to_cpu(response_data->
                                        SectorsPerAllocationUnit);
                        FSData->f_blocks =
-                                le32_to_cpu(response_data->TotalAllocationUnits);
+                               le32_to_cpu(response_data->TotalAllocationUnits);
                        FSData->f_bfree = FSData->f_bavail =
                                le32_to_cpu(response_data->FreeAllocationUnits);
                        cFYI(1,
@@ -4056,7 +4158,7 @@ QFSInfoRetry:
        pSMB->TotalParameterCount = cpu_to_le16(params);
        pSMB->ParameterCount = pSMB->TotalParameterCount;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
+                struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -4071,7 +4173,7 @@ QFSInfoRetry:
        if (rc) {
                cFYI(1, ("Send error in QFSInfo = %d", rc));
        } else {                /* decode response */
-                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
+                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
                if (rc || (pSMBr->ByteCount < 24))
                        rc = -EIO;      /* bad smb */
@@ -4136,7 +4238,7 @@ QFSAttributeRetry:
        pSMB->TotalParameterCount = cpu_to_le16(params);
        pSMB->ParameterCount = pSMB->TotalParameterCount;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
+                struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -4153,7 +4255,8 @@ QFSAttributeRetry:
        } else {                /* decode response */
                rc = validate_t2((struct smb_t2_rsp *)pSMBr);
-                if (rc || (pSMBr->ByteCount < 13)) {    /* BB also check enough bytes returned */
+                if (rc || (pSMBr->ByteCount < 13)) {
+                        /* BB also check if enough bytes returned */
                        rc = -EIO;      /* bad smb */
                } else {
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
@@ -4204,7 +4307,7 @@ QFSDeviceRetry:
        pSMB->TotalParameterCount = cpu_to_le16(params);
        pSMB->ParameterCount = pSMB->TotalParameterCount;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
+                struct smb_com_transaction2_qfsi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
@@ -4274,8 +4377,8 @@ QFSUnixRetry:
        byte_count = params + 1 /* pad */ ;
        pSMB->ParameterCount = cpu_to_le16(params);
        pSMB->TotalParameterCount = pSMB->ParameterCount;
-        pSMB->ParameterOffset = cpu_to_le16(offsetof(struct 
+        pSMB->ParameterOffset = cpu_to_le16(offsetof(struct
-        smb_com_transaction2_qfsi_req, InformationLevel) - 4);
+                        smb_com_transaction2_qfsi_req, InformationLevel) - 4);
        pSMB->SetupCount = 1;
        pSMB->Reserved3 = 0;
        pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION);
@@ -4335,7 +4438,8 @@ SETFSUnixRetry:
        pSMB->Flags = 0;
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
-        param_offset = offsetof(struct smb_com_transaction2_setfsi_req, FileNum) - 4;
+        param_offset = offsetof(struct smb_com_transaction2_setfsi_req, FileNum)
+                                - 4;
        offset = param_offset + params;
        pSMB->MaxParameterCount = cpu_to_le16(4);
@@ -4417,8 +4521,8 @@ QFSPosixRetry:
        byte_count = params + 1 /* pad */ ;
        pSMB->ParameterCount = cpu_to_le16(params);
        pSMB->TotalParameterCount = pSMB->ParameterCount;
-        pSMB->ParameterOffset = cpu_to_le16(offsetof(struct 
+        pSMB->ParameterOffset = cpu_to_le16(offsetof(struct
-        smb_com_transaction2_qfsi_req, InformationLevel) - 4);
+                        smb_com_transaction2_qfsi_req, InformationLevel) - 4);
        pSMB->SetupCount = 1;
        pSMB->Reserved3 = 0;
        pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION);
@@ -4447,18 +4551,18 @@ 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);
+                                    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);
+                                     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);
+                                      le64_to_cpu(response_data->FreeFileNodes);
                }
        }
        cifs_buf_release(pSMB);
@@ -4470,15 +4574,15 @@ QFSPosixRetry:
 }
-/* We can not use write of zero bytes trick to 
+/* We can not use write of zero bytes trick to
-   set file size due to need for large file support.  Also note that 
+   set file size due to need for large file support.  Also note that
-   this SetPathInfo is preferred to SetFileInfo based method in next 
+   this SetPathInfo is preferred to SetFileInfo based method in next
   routine which is only needed to work around a sharing violation bug
   in Samba which this routine can run into */
 int
 CIFSSMBSetEOF(const int xid, struct cifsTconInfo *tcon, const char *fileName,
-              __u64 size, int SetAllocation, 
+              __u64 size, int SetAllocation,
              const struct nls_table *nls_codepage, int remap)
 {
        struct smb_com_transaction2_spi_req *pSMB = NULL;
@@ -4517,22 +4621,22 @@ SetEOFRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
-        if(SetAllocation) {
+        if (SetAllocation) {
-                if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
+                if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
-                    pSMB->InformationLevel =
+                        pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2);
+                                cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2);
-                else
+                else
-                    pSMB->InformationLevel =
+                        pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO);
+                                cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO);
-        } else /* Set File Size */  {    
+        } else /* Set File Size */  {
            if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
                    pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2);
+                                cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2);
            else
                    pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO);
+                                cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO);
        }
        parm_data =
@@ -4567,8 +4671,8 @@ SetEOFRetry:
 }
 int
-CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, 
+CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
-                   __u16 fid, __u32 pid_of_opener, int SetAllocation)
+                   __u16 fid, __u32 pid_of_opener, int SetAllocation)
 {
        struct smb_com_transaction2_sfi_req *pSMB  = NULL;
        struct smb_com_transaction2_sfi_rsp *pSMBr = NULL;
@@ -4589,7 +4693,7 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
        pSMB->hdr.Pid = cpu_to_le16((__u16)pid_of_opener);
        pSMB->hdr.PidHigh = cpu_to_le16((__u16)(pid_of_opener >> 16));
-    
        params = 6;
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
@@ -4599,7 +4703,7 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
        param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
        offset = param_offset + params;
-        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;  
+        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
        count = sizeof(struct file_end_of_file_info);
        pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -4614,25 +4718,25 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
        pSMB->TotalParameterCount = pSMB->ParameterCount;
        pSMB->ParameterOffset = cpu_to_le16(param_offset);
        parm_data =
-                (struct file_end_of_file_info *) (((char *) &pSMB->hdr.Protocol) +
+                (struct file_end_of_file_info *) (((char *) &pSMB->hdr.Protocol)
-                        offset);
+                                + offset);
        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);
                else
                        pSMB->InformationLevel =
                                cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO);
-        } else /* Set File Size */  {    
+        } else /* Set File Size */  {
            if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)
                    pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2);
+                                cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2);
            else
                    pSMB->InformationLevel =
-                        cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO);
+                                cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO);
        }
        pSMB->Reserved4 = 0;
        pSMB->hdr.smb_buf_length += byte_count;
@@ -4648,21 +4752,21 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size,
        if (pSMB)
                cifs_small_buf_release(pSMB);
-        /* Note: On -EAGAIN error only caller can retry on handle based calls 
+        /* Note: On -EAGAIN error only caller can retry on handle based calls
                since file handle passed in no longer valid */
        return rc;
 }
-/* Some legacy servers such as NT4 require that the file times be set on 
+/* Some legacy servers such as NT4 require that the file times be set on
   an open handle, rather than by pathname - this is awkward due to
   potential access conflicts on the open, but it is unavoidable for these
   old servers since the only other choice is to go from 100 nanosecond DCE
   time and resort to the original setpathinfo level which takes the ancient
   DOS time format with 2 second granularity */
 int
-CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, const FILE_BASIC_INFO * data, 
+CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon,
-                   __u16 fid)
+                    const FILE_BASIC_INFO *data, __u16 fid)
 {
        struct smb_com_transaction2_sfi_req *pSMB  = NULL;
        struct smb_com_transaction2_sfi_rsp *pSMBr = NULL;
@@ -4684,7 +4788,7 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, const FILE_BASIC_I
        use an existing handle (rather than opening one on the fly) */
        /* pSMB->hdr.Pid = cpu_to_le16((__u16)pid_of_opener);
        pSMB->hdr.PidHigh = cpu_to_le16((__u16)(pid_of_opener >> 16));*/
-    
        params = 6;
        pSMB->MaxSetupCount = 0;
        pSMB->Reserved = 0;
@@ -4694,7 +4798,7 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, const FILE_BASIC_I
        param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
        offset = param_offset + params;
-        data_offset = (char *) (&pSMB->hdr.Protocol) + offset; 
+        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
        count = sizeof (FILE_BASIC_INFO);
        pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -4717,16 +4821,16 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, const FILE_BASIC_I
        pSMB->Reserved4 = 0;
        pSMB->hdr.smb_buf_length += byte_count;
        pSMB->ByteCount = cpu_to_le16(byte_count);
-        memcpy(data_offset,data,sizeof(FILE_BASIC_INFO));
+        memcpy(data_offset, data, sizeof(FILE_BASIC_INFO));
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        if (rc) {
-                cFYI(1,("Send error in Set Time (SetFileInfo) = %d",rc));
+                cFYI(1, ("Send error in Set Time (SetFileInfo) = %d", rc));
        }
        cifs_small_buf_release(pSMB);
-        /* Note: On -EAGAIN error only caller can retry on handle based calls 
+        /* Note: On -EAGAIN error only caller can retry on handle based calls
                since file handle passed in no longer valid */
        return rc;
@@ -4735,7 +4839,7 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, const FILE_BASIC_I
 int
 CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, const char *fileName,
-                const FILE_BASIC_INFO * data, 
+                const FILE_BASIC_INFO *data,
                const struct nls_table *nls_codepage, int remap)
 {
        TRANSACTION2_SPI_REQ *pSMB = NULL;
@@ -4760,7 +4864,7 @@ SetTimesRetry:
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fileName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, fileName, name_len);
@@ -4776,7 +4880,7 @@ SetTimesRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
        pSMB->ParameterOffset = cpu_to_le16(param_offset);
@@ -4837,11 +4941,11 @@ SetAttrLgcyRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                        ConvertToUCS((__le16 *) pSMB->fileName, fileName, 
+                        ConvertToUCS((__le16 *) pSMB->fileName, fileName,
                                PATH_MAX, nls_codepage);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fileName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->fileName, fileName, name_len);
@@ -4867,8 +4971,8 @@ SetAttrLgcyRetry:
 int
 CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *tcon,
-                    char *fileName, __u64 mode, __u64 uid, __u64 gid, 
+                    char *fileName, __u64 mode, __u64 uid, __u64 gid,
-                    dev_t device, const struct nls_table *nls_codepage, 
+                    dev_t device, const struct nls_table *nls_codepage,
                    int remap)
 {
        TRANSACTION2_SPI_REQ *pSMB = NULL;
@@ -4888,7 +4992,7 @@ setPermsRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, 
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -4908,7 +5012,7 @@ setPermsRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        data_offset =
            (FILE_UNIX_BASIC_INFO *) ((char *) &pSMB->hdr.Protocol +
@@ -4931,7 +5035,7 @@ setPermsRetry:
        older clients, but we should be precise - we use SetFileSize to
        set file size and do not want to truncate file size to zero
        accidently as happened on one Samba server beta by putting
-        zero instead of -1 here */ 
+        zero instead of -1 here */
        data_offset->EndOfFile = NO_CHANGE_64;
        data_offset->NumOfBytes = NO_CHANGE_64;
        data_offset->LastStatusChange = NO_CHANGE_64;
@@ -4943,20 +5047,20 @@ setPermsRetry:
        data_offset->DevMajor = cpu_to_le64(MAJOR(device));
        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);
@@ -4974,20 +5078,20 @@ setPermsRetry:
        return rc;
 }
-int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, 
+int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
                  const int notify_subdirs, const __u16 netfid,
-                  __u32 filter, struct file * pfile, int multishot, 
+                  __u32 filter, struct file *pfile, int multishot,
                  const struct nls_table *nls_codepage)
 {
        int rc = 0;
-        struct smb_com_transaction_change_notify_req * pSMB = NULL;
+        struct smb_com_transaction_change_notify_req *pSMB = NULL;
-        struct smb_com_ntransaction_change_notify_rsp * pSMBr = NULL;
+        struct smb_com_ntransaction_change_notify_rsp *pSMBr = NULL;
        struct dir_notify_req *dnotify_req;
        int bytes_returned;
-        cFYI(1, ("In CIFSSMBNotify for file handle %d",(int)netfid));
+        cFYI(1, ("In CIFSSMBNotify for file handle %d", (int)netfid));
        rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB,
-                      (void **) &pSMBr);
+                      (void **) &pSMBr);
        if (rc)
                return rc;
@@ -5008,7 +5112,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);
@@ -5021,11 +5125,11 @@ int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
                cFYI(1, ("Error in Notify = %d", rc));
        } else {
                /* Add file to outstanding requests */
-                /* BB change to kmem cache alloc */     
+                /* BB change to kmem cache alloc */
                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;
@@ -5036,20 +5140,20 @@ int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
                        dnotify_req->filter = filter;
                        dnotify_req->multishot = multishot;
                        spin_lock(&GlobalMid_Lock);
-                        list_add_tail(&dnotify_req->lhead, 
+                        list_add_tail(&dnotify_req->lhead,
                                        &GlobalDnotifyReqList);
                        spin_unlock(&GlobalMid_Lock);
-                } else 
+                } else
                        rc = -ENOMEM;
        }
        cifs_buf_release(pSMB);
-        return rc;      
+        return rc;
 }
 #ifdef CONFIG_CIFS_XATTR
 ssize_t
 CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
                 const unsigned char *searchName,
-                 char * EAData, size_t buf_size,
+                 char *EAData, size_t buf_size,
                 const struct nls_table *nls_codepage, int remap)
 {
                /* BB assumes one setup word */
@@ -5058,8 +5162,8 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
        int rc = 0;
        int bytes_returned;
        int name_len;
-        struct fea * temp_fea;
+        struct fea *temp_fea;
-        char * temp_ptr;
+        char *temp_ptr;
        __u16 params, byte_count;
        cFYI(1, ("In Query All EAs path %s", searchName));
@@ -5071,7 +5175,7 @@ QAllEAsRetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, 
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -5081,7 +5185,7 @@ QAllEAsRetry:
                strncpy(pSMB->FileName, searchName, name_len);
        }
-        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */ ;
+        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
        pSMB->TotalDataCount = 0;
        pSMB->MaxParameterCount = cpu_to_le16(2);
        pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */
@@ -5091,7 +5195,7 @@ QAllEAsRetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+        struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -5115,7 +5219,7 @@ QAllEAsRetry:
                /* BB also check enough total bytes returned */
                /* BB we need to improve the validity checking
                of these trans2 responses */
-                if (rc || (pSMBr->ByteCount < 4)) 
+                if (rc || (pSMBr->ByteCount < 4))
                        rc = -EIO;      /* bad smb */
           /* else if (pFindData){
                        memcpy((char *) pFindData,
@@ -5128,39 +5232,40 @@ QAllEAsRetry:
                        /* check that each element of each entry does not
                           go beyond end of list */
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
-                        struct fealist * ea_response_data;
+                        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));
+                        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"));
+                                cFYI(1, ("empty EA list returned from server"));
                        } else {
                                /* account for ea list len */
                                name_len -= 4;
                                temp_fea = ea_response_data->list;
                                temp_ptr = (char *)temp_fea;
-                                while(name_len > 0) {
+                                while (name_len > 0) {
                                        __u16 value_len;
                                        name_len -= 4;
                                        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);
+                                                memcpy(EAData, "user.", 5);
-                                                EAData+=5;
+                                                EAData += 5;
-                                                memcpy(EAData,temp_ptr,temp_fea->name_len);
+                                                memcpy(EAData, temp_ptr,
-                                                EAData+=temp_fea->name_len;
+                                                       temp_fea->name_len);
+                                                EAData += temp_fea->name_len;
                                                /* 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 */
@@ -5172,11 +5277,15 @@ QAllEAsRetry:
                                        /* account for trailing null */
                                        name_len--;
                                        temp_ptr++;
-                                        value_len = le16_to_cpu(temp_fea->value_len);
+                                        value_len =
+                                              le16_to_cpu(temp_fea->value_len);
                                        name_len -= value_len;
                                        temp_ptr += value_len;
-                                        /* BB check that temp_ptr is still within smb BB*/
+                                        /* BB check that temp_ptr is still
-                                /* no trailing null to account for in value len */
+                                              within the SMB BB*/
+                                        /* no trailing null to account for
+                                           in value len */
                                        /* go on to next EA */
                                        temp_fea = (struct fea *)temp_ptr;
                                }
@@ -5191,9 +5300,9 @@ QAllEAsRetry:
        return (ssize_t)rc;
 }
-ssize_t CIFSSMBQueryEA(const int xid,struct cifsTconInfo * tcon,
+ssize_t CIFSSMBQueryEA(const int xid, struct cifsTconInfo *tcon,
-                const unsigned char * searchName,const unsigned char * ea_name,
+                const unsigned char *searchName, const unsigned char *ea_name,
-                unsigned char * ea_value, size_t buf_size, 
+                unsigned char *ea_value, size_t buf_size,
                const struct nls_table *nls_codepage, int remap)
 {
        TRANSACTION2_QPI_REQ *pSMB = NULL;
@@ -5201,8 +5310,8 @@ ssize_t CIFSSMBQueryEA(const int xid,struct cifsTconInfo * tcon,
        int rc = 0;
        int bytes_returned;
        int name_len;
-        struct fea * temp_fea;
+        struct fea *temp_fea;
-        char * temp_ptr;
+        char *temp_ptr;
        __u16 params, byte_count;
        cFYI(1, ("In Query EA path %s", searchName));
@@ -5214,7 +5323,7 @@ QEARetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, 
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
@@ -5224,7 +5333,7 @@ QEARetry:
                strncpy(pSMB->FileName, searchName, name_len);
        }
-        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */ ;
+        params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
        pSMB->TotalDataCount = 0;
        pSMB->MaxParameterCount = cpu_to_le16(2);
        pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */
@@ -5234,7 +5343,7 @@ QEARetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        pSMB->ParameterOffset = cpu_to_le16(offsetof(
-        struct smb_com_transaction2_qpi_req ,InformationLevel) - 4);
+                struct smb_com_transaction2_qpi_req, InformationLevel) - 4);
        pSMB->DataCount = 0;
        pSMB->DataOffset = 0;
        pSMB->SetupCount = 1;
@@ -5258,7 +5367,7 @@ QEARetry:
                /* BB also check enough total bytes returned */
                /* BB we need to improve the validity checking
                of these trans2 responses */
-                if (rc || (pSMBr->ByteCount < 4)) 
+                if (rc || (pSMBr->ByteCount < 4))
                        rc = -EIO;      /* bad smb */
           /* else if (pFindData){
                        memcpy((char *) pFindData,
@@ -5271,18 +5380,18 @@ QEARetry:
                        /* check that each element of each entry does not
                           go beyond end of list */
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
-                        struct fealist * ea_response_data;
+                        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));
+                        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"));
+                                cFYI(1, ("empty EA list returned from server"));
                        } else {
                                /* account for ea list len */
                                name_len -= 4;
@@ -5290,28 +5399,30 @@ QEARetry:
                                temp_ptr = (char *)temp_fea;
                                /* loop through checking if we have a matching
                                name and then return the associated value */
-                                while(name_len > 0) {
+                                while (name_len > 0) {
                                        __u16 value_len;
                                        name_len -= 4;
                                        temp_ptr += 4;
-                                        value_len = le16_to_cpu(temp_fea->value_len);
+                                        value_len =
-                                /* BB validate that value_len falls within SMB, 
+                                              le16_to_cpu(temp_fea->value_len);
-                                even though maximum for name_len is 255 */ 
+                                /* BB validate that value_len falls within SMB,
-                                        if(memcmp(temp_fea->name,ea_name,
+                                even though maximum for name_len is 255 */
+                                        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,
+                                                        /* ea values, unlike ea
-                                                        are not null terminated */
+                                                           names, are not null
-                                                } else if(buf_size == 0) {
+                                                           terminated */
+                                                } else if (buf_size == 0) {
                                                /* skip copy - calc size only */
                                                } else {
-                                                        /* stop before overrun buffer */
+                                                /* stop before overrun buffer */
                                                        rc = -ERANGE;
                                                }
                                                break;
@@ -5323,11 +5434,11 @@ QEARetry:
                                        temp_ptr++;
                                        name_len -= value_len;
                                        temp_ptr += value_len;
-                                /* no trailing null to account for in value len */
+                                        /* No trailing null to account for in
-                                        /* go on to next EA */
+                                           value_len.  Go on to next EA */
                                        temp_fea = (struct fea *)temp_ptr;
                                }
-                        } 
+                        }
                }
        }
        if (pSMB)
@@ -5340,9 +5451,9 @@ QEARetry:
 int
 CIFSSMBSetEA(const int xid, struct cifsTconInfo *tcon, const char *fileName,
-                const char * ea_name, const void * ea_value, 
+             const char *ea_name, const void *ea_value,
-                const __u16 ea_value_len, const struct nls_table *nls_codepage,
+             const __u16 ea_value_len, const struct nls_table *nls_codepage,
-                int remap)
+             int remap)
 {
        struct smb_com_transaction2_spi_req *pSMB = NULL;
        struct smb_com_transaction2_spi_rsp *pSMBr = NULL;
@@ -5361,11 +5472,11 @@ SetEARetry:
        if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, 
+                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
                                     PATH_MAX, nls_codepage, remap);
                name_len++;     /* trailing null */
                name_len *= 2;
-        } else {                /* BB improve the check for buffer overruns BB */
+        } else {        /* BB improve the check for buffer overruns BB */
                name_len = strnlen(fileName, PATH_MAX);
                name_len++;     /* trailing null */
                strncpy(pSMB->FileName, fileName, name_len);
@@ -5376,10 +5487,10 @@ 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);
+                name_len = strnlen(ea_name, 255);
        count = sizeof(*parm_data) + ea_value_len + name_len + 1;
        pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -5390,7 +5501,7 @@ SetEARetry:
        pSMB->Timeout = 0;
        pSMB->Reserved2 = 0;
        param_offset = offsetof(struct smb_com_transaction2_spi_req,
-                                     InformationLevel) - 4;
+                                InformationLevel) - 4;
        offset = param_offset + params;
        pSMB->InformationLevel =
                cpu_to_le16(SMB_SET_FILE_EA);
@@ -5410,17 +5521,19 @@ 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);
+                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);
        /* caller ensures that ea_value_len is less than 64K but
        we need to ensure that it fits within the smb */
-        /*BB add length check that it would fit in negotiated SMB buffer size BB */
+        /*BB add length check to see if it would fit in
-        /* if(ea_value_len > buffer_size - 512 (enough for header)) */
+             negotiated SMB buffer size BB */
-        if(ea_value_len)
+        /* if (ea_value_len > buffer_size - 512 (enough for header)) */
-                memcpy(parm_data->list[0].name+name_len+1,ea_value,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;
        pSMB->ParameterCount = cpu_to_le16(params);