1 files changed, 30 insertions, 13 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index db28b561cd4b..4061e43471c1 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs_debug.c
  *
- *   Copyright (C) International Business Machines  Corp., 2000,2003
+ *   Copyright (C) International Business Machines  Corp., 2000,2005
  *
  *   Modified by Steve French (sfrench@us.ibm.com)
  *
@@ -29,6 +29,7 @@
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
+#include "cifsfs.h"
 
 void
 cifs_dump_mem(char *label, void *data, int length)
@@ -78,8 +79,9 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                     "Display Internal CIFS Data Structures for Debugging\n"
                     "---------------------------------------------------\n");
         buf += length;
-
-        length = sprintf(buf, "Servers:\n");
+        length = sprintf(buf,"CIFS Version %s\n",CIFS_VERSION);
+        buf += length;
+        length = sprintf(buf, "Servers:");
         buf += length;
 
         i = 0;
@@ -87,12 +89,21 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
         list_for_each(tmp, &GlobalSMBSessionList) {
                 i++;
                 ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
-                length =
-                    sprintf(buf,
-                            "\n%d) Name: %s  Domain: %s Mounts: %d ServerOS: %s  \n\tServerNOS: %s\tCapabilities: 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);
-                buf += length;
+                if((ses->serverDomain == NULL) || (ses->serverOS == NULL) ||
+                   (ses->serverNOS == NULL)) {
+                        buf += sprintf("\nentry for %s not fully displayed\n\t",
+                                        ses->serverName);
+                        
+                } else {
+                        length =
+                            sprintf(buf,
+                                    "\n%d) Name: %s  Domain: %s Mounts: %d ServerOS: %s  \n\tServerNOS: %s\tCapabilities: 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);
+                        buf += length;
+                }
                 if(ses->server) {
                         buf += sprintf(buf, "TCP status: %d\n\tLocal Users To Server: %d SecMode: 0x%x Req Active: %d",
                                 ses->server->tcpStatus,
@@ -100,7 +111,7 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                                 ses->server->secMode,
                                 atomic_read(&ses->server->inFlight));
                         
-                        length = sprintf(buf, "\nMIDs: \n");
+                        length = sprintf(buf, "\nMIDs:\n");
                         buf += length;
 
                         spin_lock(&GlobalMid_Lock);
@@ -109,7 +120,12 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                                         mid_q_entry,
                                         qhead);
                                 if(mid_entry) {
-                                        length = sprintf(buf,"State: %d com: %d pid: %d tsk: %p mid %d\n",mid_entry->midState,mid_entry->command,mid_entry->pid,mid_entry->tsk,mid_entry->mid);
+                                        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;
                                 }
                         }
@@ -121,7 +137,7 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
         sprintf(buf, "\n");
         buf++;
 
-        length = sprintf(buf, "\nShares:\n");
+        length = sprintf(buf, "Shares:");
         buf += length;
 
         i = 0;
@@ -200,7 +216,8 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset,
         buf += item_length;      
         item_length = 
                 sprintf(buf,"SMB Request/Response Buffer: %d Pool size: %d\n",
-                        bufAllocCount.counter,cifs_min_rcv + tcpSesAllocCount.counter);
+                        bufAllocCount.counter,
+                        cifs_min_rcv + tcpSesAllocCount.counter);
         length += item_length;
         buf += item_length;
         item_length =