dlm: dlm_process_incoming_buffer() fixes
[safe/jmp/linux-2.6] / fs / cifs / cifs_debug.c
index 7f19f25..73c4c41 100644 (file)
@@ -7,16 +7,16 @@
  *
  *   This program is free software;  you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or 
+ *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
- * 
+ *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
  *   the GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software 
+ *   along with this program;  if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #include <linux/fs.h>
@@ -39,7 +39,7 @@ cifs_dump_mem(char *label, void *data, int length)
        char *charptr = data;
        char buf[10], line[80];
 
-       printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n\n", 
+       printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n",
                label, length, data);
        for (i = 0; i < length; i += 16) {
                line[0] = 0;
@@ -57,6 +57,56 @@ cifs_dump_mem(char *label, void *data, int length)
        }
 }
 
+#ifdef CONFIG_CIFS_DEBUG2
+void cifs_dump_detail(struct smb_hdr *smb)
+{
+       cERROR(1, ("Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d",
+                 smb->Command, smb->Status.CifsError,
+                 smb->Flags, smb->Flags2, smb->Mid, smb->Pid));
+       cERROR(1, ("smb buf %p len %d", smb, smbCalcSize_LE(smb)));
+}
+
+
+void cifs_dump_mids(struct TCP_Server_Info *server)
+{
+       struct list_head *tmp;
+       struct mid_q_entry *mid_entry;
+
+       if (server == NULL)
+               return;
+
+       cERROR(1, ("Dump pending requests:"));
+       spin_lock(&GlobalMid_Lock);
+       list_for_each(tmp, &server->pending_mid_q) {
+               mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
+               if (mid_entry) {
+                       cERROR(1, ("State: %d Cmd: %d Pid: %d Tsk: %p Mid %d",
+                               mid_entry->midState,
+                               (int)mid_entry->command,
+                               mid_entry->pid,
+                               mid_entry->tsk,
+                               mid_entry->mid));
+#ifdef CONFIG_CIFS_STATS2
+                       cERROR(1, ("IsLarge: %d buf: %p time rcv: %ld now: %ld",
+                               mid_entry->largeBuf,
+                               mid_entry->resp_buf,
+                               mid_entry->when_received,
+                               jiffies));
+#endif /* STATS2 */
+                       cERROR(1, ("IsMult: %d IsEnd: %d", mid_entry->multiRsp,
+                                 mid_entry->multiEnd));
+                       if (mid_entry->resp_buf) {
+                               cifs_dump_detail(mid_entry->resp_buf);
+                               cifs_dump_mem("existing buf: ",
+                                       mid_entry->resp_buf,
+                                       62 /* fixme */);
+                       }
+               }
+       }
+       spin_unlock(&GlobalMid_Lock);
+}
+#endif /* CONFIG_CIFS_DEBUG2 */
+
 #ifdef CONFIG_PROC_FS
 static int
 cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
@@ -64,24 +114,24 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
 {
        struct list_head *tmp;
        struct list_head *tmp1;
-       struct mid_q_entry * mid_entry;
+       struct mid_q_entry *mid_entry;
        struct cifsSesInfo *ses;
        struct cifsTconInfo *tcon;
        int i;
        int length = 0;
-       char * original_buf = buf;
+       char *original_buf = buf;
 
        *beginBuffer = buf + offset;
 
-       
        length =
            sprintf(buf,
                    "Display Internal CIFS Data Structures for Debugging\n"
                    "---------------------------------------------------\n");
        buf += length;
-       length = sprintf(buf,"CIFS Version %s\n",CIFS_VERSION);
+       length = sprintf(buf, "CIFS Version %s\n", CIFS_VERSION);
        buf += length;
-       length = sprintf(buf,"Active VFS Requests: %d\n", GlobalTotalActiveXid);
+       length = sprintf(buf,
+               "Active VFS Requests: %d\n", GlobalTotalActiveXid);
        buf += length;
        length = sprintf(buf, "Servers:");
        buf += length;
@@ -91,23 +141,25 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
        list_for_each(tmp, &GlobalSMBSessionList) {
                i++;
                ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
-               if((ses->serverDomain == NULL) || (ses->serverOS == NULL) ||
+               if ((ses->serverDomain == NULL) || (ses->serverOS == NULL) ||
                   (ses->serverNOS == NULL)) {
-                       buf += sprintf("\nentry for %s not fully displayed\n\t",
-                                       ses->serverName);
-                       
+                       buf += sprintf(buf, "\nentry for %s not fully "
+                                       "displayed\n\t", ses->serverName);
                } else {
                        length =
                            sprintf(buf,
-                                   "\n%d) Name: %s  Domain: %s Mounts: %d OS: %s  \n\tNOS: %s\tCapability: 0x%x\n\tSMB session status: %d\t",
+                                   "\n%d) Name: %s  Domain: %s Mounts: %d OS:"
+                                   " %s  \n\tNOS: %s\tCapability: 0x%x\n\tSMB"
+                                   " session status: %d\t",
                                i, ses->serverName, ses->serverDomain,
                                atomic_read(&ses->inUse),
                                ses->serverOS, ses->serverNOS,
-                               ses->capabilities,ses->status);
+                               ses->capabilities, ses->status);
                        buf += length;
                }
-               if(ses->server) {
-                       buf += sprintf(buf, "TCP status: %d\n\tLocal Users To Server: %d SecMode: 0x%x Req On Wire: %d",
+               if (ses->server) {
+                       buf += sprintf(buf, "TCP status: %d\n\tLocal Users To "
+                                   "Server: %d SecMode: 0x%x Req On Wire: %d",
                                ses->server->tcpStatus,
                                atomic_read(&ses->server->socketUseCount),
                                ses->server->secMode,
@@ -115,7 +167,7 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
 
 #ifdef CONFIG_CIFS_STATS2
                        buf += sprintf(buf, " In Send: %d In MaxReq Wait: %d",
-                               atomic_read(&ses->server->inSend), 
+                               atomic_read(&ses->server->inSend),
                                atomic_read(&ses->server->num_waiters));
 #endif
 
@@ -127,17 +179,19 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                                mid_entry = list_entry(tmp1, struct
                                        mid_q_entry,
                                        qhead);
-                               if(mid_entry) {
-                                       length = sprintf(buf,"State: %d com: %d pid: %d tsk: %p mid %d\n",
-                                               mid_entry->midState,
-                                               (int)mid_entry->command,
-                                               mid_entry->pid,
-                                               mid_entry->tsk,
-                                               mid_entry->mid);
+                               if (mid_entry) {
+                                       length = sprintf(buf,
+                                                       "State: %d com: %d pid:"
+                                                       " %d tsk: %p mid %d\n",
+                                                       mid_entry->midState,
+                                                       (int)mid_entry->command,
+                                                       mid_entry->pid,
+                                                       mid_entry->tsk,
+                                                       mid_entry->mid);
                                        buf += length;
                                }
                        }
-                       spin_unlock(&GlobalMid_Lock); 
+                       spin_unlock(&GlobalMid_Lock);
                }
 
        }
@@ -155,17 +209,21 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                i++;
                tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
                dev_type = le32_to_cpu(tcon->fsDevInfo.DeviceType);
-               length =
-                   sprintf(buf,
-                           "\n%d) %s Uses: %d Type: %s DevInfo: 0x%x Attributes: 0x%x\nPathComponentMax: %d Status: %d",
-                           i, tcon->treeName,
-                           atomic_read(&tcon->useCount),
-                           tcon->nativeFileSystem,
+               length = sprintf(buf, "\n%d) %s Uses: %d ", i,
+                                tcon->treeName, atomic_read(&tcon->useCount));
+               buf += length;
+               if (tcon->nativeFileSystem) {
+                       length = sprintf(buf, "Type: %s ",
+                                        tcon->nativeFileSystem);
+                       buf += length;
+               }
+               length = sprintf(buf, "DevInfo: 0x%x Attributes: 0x%x"
+                                "\nPathComponentMax: %d Status: %d",
                            le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics),
                            le32_to_cpu(tcon->fsAttrInfo.Attributes),
                            le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength),
                            tcon->tidStatus);
-               buf += length;        
+               buf += length;
                if (dev_type == FILE_DEVICE_DISK)
                        length = sprintf(buf, " type: DISK ");
                else if (dev_type == FILE_DEVICE_CD_ROM)
@@ -174,7 +232,7 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                        length =
                            sprintf(buf, " type: %d ", dev_type);
                buf += length;
-               if(tcon->tidStatus == CifsNeedReconnect) {
+               if (tcon->tidStatus == CifsNeedReconnect) {
                        buf += sprintf(buf, "\tDISCONNECTED ");
                        length += 14;
                }
@@ -188,9 +246,9 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
        /* Now calculate total size of returned data */
        length = buf - original_buf;
 
-       if(offset + count >= length)
+       if (offset + count >= length)
                *eof = 1;
-       if(length < offset) {
+       if (length < offset) {
                *eof = 1;
                return 0;
        } else {
@@ -206,18 +264,18 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
 
 static int
 cifs_stats_write(struct file *file, const char __user *buffer,
-               unsigned long count, void *data)
+                unsigned long count, void *data)
 {
-        char c;
-        int rc;
+       char c;
+       int rc;
        struct list_head *tmp;
        struct cifsTconInfo *tcon;
 
-        rc = get_user(c, buffer);
-        if (rc)
-                return rc;
+       rc = get_user(c, buffer);
+       if (rc)
+               return rc;
 
-        if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
+       if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
                read_lock(&GlobalSMBSeslock);
 #ifdef CONFIG_CIFS_STATS2
                atomic_set(&totBufAllocCount, 0);
@@ -247,14 +305,14 @@ cifs_stats_write(struct file *file, const char __user *buffer,
                read_unlock(&GlobalSMBSeslock);
        }
 
-        return count;
+       return count;
 }
 
 static int
 cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
                  int count, int *eof, void *data)
 {
-       int item_length,i,length;
+       int item_length, i, length;
        struct list_head *tmp;
        struct cifsTconInfo *tcon;
 
@@ -264,36 +322,44 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
                        "Resources in use\nCIFS Session: %d\n",
                        sesInfoAllocCount.counter);
        buf += length;
-       item_length = 
-               sprintf(buf,"Share (unique mount targets): %d\n",
+       item_length =
+               sprintf(buf, "Share (unique mount targets): %d\n",
                        tconInfoAllocCount.counter);
        length += item_length;
-       buf += item_length;      
-       item_length = 
-               sprintf(buf,"SMB Request/Response Buffer: %d Pool size: %d\n",
+       buf += item_length;
+       item_length =
+               sprintf(buf, "SMB Request/Response Buffer: %d Pool size: %d\n",
                        bufAllocCount.counter,
                        cifs_min_rcv + tcpSesAllocCount.counter);
        length += item_length;
        buf += item_length;
-       item_length = 
-               sprintf(buf,"SMB Small Req/Resp Buffer: %d Pool size: %d\n",
-                       smBufAllocCount.counter,cifs_min_small);
+       item_length =
+               sprintf(buf, "SMB Small Req/Resp Buffer: %d Pool size: %d\n",
+                       smBufAllocCount.counter, cifs_min_small);
+       length += item_length;
+       buf += item_length;
+#ifdef CONFIG_CIFS_STATS2
+       item_length = sprintf(buf, "Total Large %d Small %d Allocations\n",
+                               atomic_read(&totBufAllocCount),
+                               atomic_read(&totSmBufAllocCount));
        length += item_length;
        buf += item_length;
-       item_length = 
-               sprintf(buf,"Operations (MIDs): %d\n",
+#endif /* CONFIG_CIFS_STATS2 */
+
+       item_length =
+               sprintf(buf, "Operations (MIDs): %d\n",
                        midCount.counter);
        length += item_length;
        buf += item_length;
        item_length = sprintf(buf,
                "\n%d session %d share reconnects\n",
-               tcpSesReconnectCount.counter,tconInfoReconnectCount.counter);
+               tcpSesReconnectCount.counter, tconInfoReconnectCount.counter);
        length += item_length;
        buf += item_length;
 
        item_length = sprintf(buf,
                "Total vfs operations: %d maximum at one time: %d\n",
-               GlobalCurrentXid,GlobalMaxActiveXid);
+               GlobalCurrentXid, GlobalMaxActiveXid);
        length += item_length;
        buf += item_length;
 
@@ -302,10 +368,10 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
        list_for_each(tmp, &GlobalTreeConnectionList) {
                i++;
                tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
-               item_length = sprintf(buf,"\n%d) %s",i, tcon->treeName);
+               item_length = sprintf(buf, "\n%d) %s", i, tcon->treeName);
                buf += item_length;
                length += item_length;
-               if(tcon->tidStatus == CifsNeedReconnect) {
+               if (tcon->tidStatus == CifsNeedReconnect) {
                        buf += sprintf(buf, "\tDISCONNECTED ");
                        length += 14;
                }
@@ -322,15 +388,15 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
                item_length = sprintf(buf, "\nWrites: %d Bytes: %lld",
                        atomic_read(&tcon->num_writes),
                        (long long)(tcon->bytes_written));
-                buf += item_length;
-                length += item_length;
-                item_length = sprintf(buf, 
+               buf += item_length;
+               length += item_length;
+               item_length = sprintf(buf,
                        "\nLocks: %d HardLinks: %d Symlinks: %d",
-                        atomic_read(&tcon->num_locks),
+                       atomic_read(&tcon->num_locks),
                        atomic_read(&tcon->num_hardlinks),
                        atomic_read(&tcon->num_symlinks));
-                buf += item_length;
-                length += item_length;
+               buf += item_length;
+               length += item_length;
 
                item_length = sprintf(buf, "\nOpens: %d Closes: %d Deletes: %d",
                        atomic_read(&tcon->num_opens),
@@ -357,12 +423,12 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
        }
        read_unlock(&GlobalSMBSeslock);
 
-       buf += sprintf(buf,"\n");
+       buf += sprintf(buf, "\n");
        length++;
 
-       if(offset + count >= length)
+       if (offset + count >= length)
                *eof = 1;
-       if(length < offset) {
+       if (length < offset) {
                *eof = 1;
                return 0;
        } else {
@@ -370,7 +436,7 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
        }
        if (length > count)
                length = count;
-               
+
        return length;
 }
 #endif
@@ -387,14 +453,14 @@ static read_proc_t traceSMB_read;
 static write_proc_t traceSMB_write;
 static read_proc_t multiuser_mount_read;
 static write_proc_t multiuser_mount_write;
-static read_proc_t extended_security_read;
-static write_proc_t extended_security_write;
-static read_proc_t ntlmv2_enabled_read;
+static read_proc_t security_flags_read;
+static write_proc_t security_flags_write;
+/* static read_proc_t ntlmv2_enabled_read;
 static write_proc_t ntlmv2_enabled_write;
 static read_proc_t packet_signing_enabled_read;
-static write_proc_t packet_signing_enabled_write;
-static read_proc_t quotaEnabled_read;
-static write_proc_t quotaEnabled_write;
+static write_proc_t packet_signing_enabled_write;*/
+static read_proc_t experimEnabled_read;
+static write_proc_t experimEnabled_write;
 static read_proc_t linuxExtensionsEnabled_read;
 static write_proc_t linuxExtensionsEnabled_write;
 
@@ -434,9 +500,9 @@ cifs_proc_init(void)
                pde->write_proc = oplockEnabled_write;
 
        pde = create_proc_read_entry("Experimental", 0, proc_fs_cifs,
-                               quotaEnabled_read, NULL);
+                               experimEnabled_read, NULL);
        if (pde)
-               pde->write_proc = quotaEnabled_write;
+               pde->write_proc = experimEnabled_write;
 
        pde = create_proc_read_entry("LinuxExtensionsEnabled", 0, proc_fs_cifs,
                                linuxExtensionsEnabled_read, NULL);
@@ -450,10 +516,10 @@ cifs_proc_init(void)
                pde->write_proc = multiuser_mount_write;
 
        pde =
-           create_proc_read_entry("ExtendedSecurity", 0, proc_fs_cifs,
-                               extended_security_read, NULL);
+           create_proc_read_entry("SecurityFlags", 0, proc_fs_cifs,
+                               security_flags_read, NULL);
        if (pde)
-               pde->write_proc = extended_security_write;
+               pde->write_proc = security_flags_write;
 
        pde =
        create_proc_read_entry("LookupCacheEnabled", 0, proc_fs_cifs,
@@ -461,7 +527,7 @@ cifs_proc_init(void)
        if (pde)
                pde->write_proc = lookupFlag_write;
 
-       pde =
+/*     pde =
            create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs,
                                ntlmv2_enabled_read, NULL);
        if (pde)
@@ -471,7 +537,7 @@ cifs_proc_init(void)
            create_proc_read_entry("PacketSigningEnabled", 0, proc_fs_cifs,
                                packet_signing_enabled_read, NULL);
        if (pde)
-               pde->write_proc = packet_signing_enabled_write;
+               pde->write_proc = packet_signing_enabled_write;*/
 }
 
 void
@@ -488,12 +554,12 @@ cifs_proc_clean(void)
 #endif
        remove_proc_entry("MultiuserMount", proc_fs_cifs);
        remove_proc_entry("OplockEnabled", proc_fs_cifs);
-       remove_proc_entry("NTLMV2Enabled",proc_fs_cifs);
-       remove_proc_entry("ExtendedSecurity",proc_fs_cifs);
-       remove_proc_entry("PacketSigningEnabled",proc_fs_cifs);
-       remove_proc_entry("LinuxExtensionsEnabled",proc_fs_cifs);
-       remove_proc_entry("Experimental",proc_fs_cifs);
-       remove_proc_entry("LookupCacheEnabled",proc_fs_cifs);
+/*     remove_proc_entry("NTLMV2Enabled",proc_fs_cifs); */
+       remove_proc_entry("SecurityFlags", proc_fs_cifs);
+/*     remove_proc_entry("PacketSigningEnabled", proc_fs_cifs); */
+       remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);
+       remove_proc_entry("Experimental", proc_fs_cifs);
+       remove_proc_entry("LookupCacheEnabled", proc_fs_cifs);
        remove_proc_entry("cifs", proc_root_fs);
 }
 
@@ -532,7 +598,7 @@ cifsFYI_write(struct file *file, const char __user *buffer,
                cifsFYI = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
                cifsFYI = 1;
-       else if((c > '1') && (c <= '9'))
+       else if ((c > '1') && (c <= '9'))
                cifsFYI = (int) (c - '0'); /* see cifs_debug.h for meanings */
 
        return count;
@@ -578,93 +644,12 @@ oplockEnabled_write(struct file *file, const char __user *buffer,
 }
 
 static int
-quotaEnabled_read(char *page, char **start, off_t off,
-                   int count, int *eof, void *data)
-{
-        int len;
-
-        len = sprintf(page, "%d\n", experimEnabled);
-/* could also check if quotas are enabled in kernel
-       as a whole first */
-        len -= off;
-        *start = page + off;
-
-        if (len > count)
-                len = count;
-        else
-                *eof = 1;
-
-        if (len < 0)
-                len = 0;
-
-        return len;
-}
-static int
-quotaEnabled_write(struct file *file, const char __user *buffer,
-                    unsigned long count, void *data)
-{
-        char c;
-        int rc;
-
-        rc = get_user(c, buffer);
-        if (rc)
-                return rc;
-        if (c == '0' || c == 'n' || c == 'N')
-                experimEnabled = 0;
-        else if (c == '1' || c == 'y' || c == 'Y')
-                experimEnabled = 1;
-
-        return count;
-}
-
-static int
-linuxExtensionsEnabled_read(char *page, char **start, off_t off,
-                   int count, int *eof, void *data)
-{
-        int len;
-
-        len = sprintf(page, "%d\n", linuxExtEnabled);
-/* could also check if quotas are enabled in kernel
-       as a whole first */
-        len -= off;
-        *start = page + off;
-
-        if (len > count)
-                len = count;
-        else
-                *eof = 1;
-
-        if (len < 0)
-                len = 0;
-
-        return len;
-}
-static int
-linuxExtensionsEnabled_write(struct file *file, const char __user *buffer,
-                    unsigned long count, void *data)
-{
-        char c;
-        int rc;
-
-        rc = get_user(c, buffer);
-        if (rc)
-                return rc;
-        if (c == '0' || c == 'n' || c == 'N')
-                linuxExtEnabled = 0;
-        else if (c == '1' || c == 'y' || c == 'Y')
-                linuxExtEnabled = 1;
-
-        return count;
-}
-
-
-static int
-lookupFlag_read(char *page, char **start, off_t off,
-                  int count, int *eof, void *data)
+experimEnabled_read(char *page, char **start, off_t off,
+                   int count, int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", lookupCacheEnabled);
+       len = sprintf(page, "%d\n", experimEnabled);
 
        len -= off;
        *start = page + off;
@@ -680,8 +665,8 @@ lookupFlag_read(char *page, char **start, off_t off,
        return len;
 }
 static int
-lookupFlag_write(struct file *file, const char __user *buffer,
-                   unsigned long count, void *data)
+experimEnabled_write(struct file *file, const char __user *buffer,
+                    unsigned long count, void *data)
 {
        char c;
        int rc;
@@ -690,20 +675,22 @@ lookupFlag_write(struct file *file, const char __user *buffer,
        if (rc)
                return rc;
        if (c == '0' || c == 'n' || c == 'N')
-               lookupCacheEnabled = 0;
+               experimEnabled = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
-               lookupCacheEnabled = 1;
+               experimEnabled = 1;
+       else if (c == '2')
+               experimEnabled = 2;
 
        return count;
 }
+
 static int
-traceSMB_read(char *page, char **start, off_t off, int count,
-             int *eof, void *data)
+linuxExtensionsEnabled_read(char *page, char **start, off_t off,
+                           int count, int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", traceSMB);
-
+       len = sprintf(page, "%d\n", linuxExtEnabled);
        len -= off;
        *start = page + off;
 
@@ -718,8 +705,8 @@ traceSMB_read(char *page, char **start, off_t off, int count,
        return len;
 }
 static int
-traceSMB_write(struct file *file, const char __user *buffer,
-              unsigned long count, void *data)
+linuxExtensionsEnabled_write(struct file *file, const char __user *buffer,
+                            unsigned long count, void *data)
 {
        char c;
        int rc;
@@ -728,20 +715,21 @@ traceSMB_write(struct file *file, const char __user *buffer,
        if (rc)
                return rc;
        if (c == '0' || c == 'n' || c == 'N')
-               traceSMB = 0;
+               linuxExtEnabled = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
-               traceSMB = 1;
+               linuxExtEnabled = 1;
 
        return count;
 }
 
+
 static int
-multiuser_mount_read(char *page, char **start, off_t off,
-                    int count, int *eof, void *data)
+lookupFlag_read(char *page, char **start, off_t off,
+               int count, int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", multiuser_mount);
+       len = sprintf(page, "%d\n", lookupCacheEnabled);
 
        len -= off;
        *start = page + off;
@@ -757,8 +745,8 @@ multiuser_mount_read(char *page, char **start, off_t off,
        return len;
 }
 static int
-multiuser_mount_write(struct file *file, const char __user *buffer,
-                     unsigned long count, void *data)
+lookupFlag_write(struct file *file, const char __user *buffer,
+                   unsigned long count, void *data)
 {
        char c;
        int rc;
@@ -767,20 +755,19 @@ multiuser_mount_write(struct file *file, const char __user *buffer,
        if (rc)
                return rc;
        if (c == '0' || c == 'n' || c == 'N')
-               multiuser_mount = 0;
+               lookupCacheEnabled = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
-               multiuser_mount = 1;
+               lookupCacheEnabled = 1;
 
        return count;
 }
-
 static int
-extended_security_read(char *page, char **start, off_t off,
-                      int count, int *eof, void *data)
+traceSMB_read(char *page, char **start, off_t off, int count,
+             int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", extended_security);
+       len = sprintf(page, "%d\n", traceSMB);
 
        len -= off;
        *start = page + off;
@@ -796,8 +783,8 @@ extended_security_read(char *page, char **start, off_t off,
        return len;
 }
 static int
-extended_security_write(struct file *file, const char __user *buffer,
-                       unsigned long count, void *data)
+traceSMB_write(struct file *file, const char __user *buffer,
+              unsigned long count, void *data)
 {
        char c;
        int rc;
@@ -806,20 +793,20 @@ extended_security_write(struct file *file, const char __user *buffer,
        if (rc)
                return rc;
        if (c == '0' || c == 'n' || c == 'N')
-               extended_security = 0;
+               traceSMB = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
-               extended_security = 1;
+               traceSMB = 1;
 
        return count;
 }
 
 static int
-ntlmv2_enabled_read(char *page, char **start, off_t off,
-                      int count, int *eof, void *data)
+multiuser_mount_read(char *page, char **start, off_t off,
+                    int count, int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", ntlmv2_support);
+       len = sprintf(page, "%d\n", multiuser_mount);
 
        len -= off;
        *start = page + off;
@@ -835,8 +822,8 @@ ntlmv2_enabled_read(char *page, char **start, off_t off,
        return len;
 }
 static int
-ntlmv2_enabled_write(struct file *file, const char __user *buffer,
-                       unsigned long count, void *data)
+multiuser_mount_write(struct file *file, const char __user *buffer,
+                     unsigned long count, void *data)
 {
        char c;
        int rc;
@@ -845,20 +832,20 @@ ntlmv2_enabled_write(struct file *file, const char __user *buffer,
        if (rc)
                return rc;
        if (c == '0' || c == 'n' || c == 'N')
-               ntlmv2_support = 0;
+               multiuser_mount = 0;
        else if (c == '1' || c == 'y' || c == 'Y')
-               ntlmv2_support = 1;
+               multiuser_mount = 1;
 
        return count;
 }
 
 static int
-packet_signing_enabled_read(char *page, char **start, off_t off,
+security_flags_read(char *page, char **start, off_t off,
                       int count, int *eof, void *data)
 {
        int len;
 
-       len = sprintf(page, "%d\n", sign_CIFS_PDUs);
+       len = sprintf(page, "0x%x\n", extended_security);
 
        len -= off;
        *start = page + off;
@@ -874,24 +861,61 @@ packet_signing_enabled_read(char *page, char **start, off_t off,
        return len;
 }
 static int
-packet_signing_enabled_write(struct file *file, const char __user *buffer,
+security_flags_write(struct file *file, const char __user *buffer,
                        unsigned long count, void *data)
 {
+       unsigned int flags;
+       char flags_string[12];
        char c;
-       int rc;
 
-       rc = get_user(c, buffer);
-       if (rc)
-               return rc;
-       if (c == '0' || c == 'n' || c == 'N')
-               sign_CIFS_PDUs = 0;
-       else if (c == '1' || c == 'y' || c == 'Y')
-               sign_CIFS_PDUs = 1;
-       else if (c == '2')
-               sign_CIFS_PDUs = 2;
+       if ((count < 1) || (count > 11))
+               return -EINVAL;
+
+       memset(flags_string, 0, 12);
+
+       if (copy_from_user(flags_string, buffer, count))
+               return -EFAULT;
+
+       if (count < 3) {
+               /* single char or single char followed by null */
+               c = flags_string[0];
+               if (c == '0' || c == 'n' || c == 'N') {
+                       extended_security = CIFSSEC_DEF; /* default */
+                       return count;
+               } else if (c == '1' || c == 'y' || c == 'Y') {
+                       extended_security = CIFSSEC_MAX;
+                       return count;
+               } else if (!isdigit(c)) {
+                       cERROR(1, ("invalid flag %c", c));
+                       return -EINVAL;
+               }
+       }
+       /* else we have a number */
 
-       return count;
-}
+       flags = simple_strtoul(flags_string, NULL, 0);
 
+       cFYI(1, ("sec flags 0x%x", flags));
+
+       if (flags <= 0)  {
+               cERROR(1, ("invalid security flags %s", flags_string));
+               return -EINVAL;
+       }
 
+       if (flags & ~CIFSSEC_MASK) {
+               cERROR(1, ("attempt to set unsupported security flags 0x%x",
+                       flags & ~CIFSSEC_MASK));
+               return -EINVAL;
+       }
+       /* flags look ok - update the global security flags for cifs module */
+       extended_security = flags;
+       if (extended_security & CIFSSEC_MUST_SIGN) {
+               /* requiring signing implies signing is allowed */
+               extended_security |= CIFSSEC_MAY_SIGN;
+               cFYI(1, ("packet signing now required"));
+       } else if ((extended_security & CIFSSEC_MAY_SIGN) == 0) {
+               cFYI(1, ("packet signing disabled"));
+       }
+       /* BB should we turn on MAY flags for other MUST options? */
+       return count;
+}
 #endif