Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / fs / cifs / cifs_debug.c

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 8aae8e28038c34b248b0f38cc5f1242051bf6c2e..d9ea6ede6a7a7e5fbd60aae056cfded4b41b6f18 100644 (file)
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -57,19 +57,21 @@ cifs_dump_mem(char *label, void *data, int length)
        }
 }
 
-#ifdef CONFIG_CIFS_DEBUG2
 void cifs_dump_detail(void *buf)
 {
+#ifdef CONFIG_CIFS_DEBUG2
        struct smb_hdr *smb = (struct smb_hdr *)buf;
 
        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(smb));
+       cERROR(1, "smb buf %p len %u", smb, smbCalcSize(smb));
+#endif /* CONFIG_CIFS_DEBUG2 */
 }
 
 void cifs_dump_mids(struct TCP_Server_Info *server)
 {
+#ifdef CONFIG_CIFS_DEBUG2
        struct list_head *tmp;
        struct mid_q_entry *mid_entry;
 
@@ -102,8 +104,8 @@ void cifs_dump_mids(struct TCP_Server_Info *server)
                }
        }
        spin_unlock(&GlobalMid_Lock);
-}
 #endif /* CONFIG_CIFS_DEBUG2 */
+}
 
 #ifdef CONFIG_PROC_FS
 static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
@@ -280,24 +282,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
                                                          struct cifs_tcon,
                                                          tcon_list);
                                        atomic_set(&tcon->num_smbs_sent, 0);
-                                       atomic_set(&tcon->num_writes, 0);
-                                       atomic_set(&tcon->num_reads, 0);
-                                       atomic_set(&tcon->num_oplock_brks, 0);
-                                       atomic_set(&tcon->num_opens, 0);
-                                       atomic_set(&tcon->num_posixopens, 0);
-                                       atomic_set(&tcon->num_posixmkdirs, 0);
-                                       atomic_set(&tcon->num_closes, 0);
-                                       atomic_set(&tcon->num_deletes, 0);
-                                       atomic_set(&tcon->num_mkdirs, 0);
-                                       atomic_set(&tcon->num_rmdirs, 0);
-                                       atomic_set(&tcon->num_renames, 0);
-                                       atomic_set(&tcon->num_t2renames, 0);
-                                       atomic_set(&tcon->num_ffirst, 0);
-                                       atomic_set(&tcon->num_fnext, 0);
-                                       atomic_set(&tcon->num_fclose, 0);
-                                       atomic_set(&tcon->num_hardlinks, 0);
-                                       atomic_set(&tcon->num_symlinks, 0);
-                                       atomic_set(&tcon->num_locks, 0);
+                                       if (server->ops->clear_stats)
+                                               server->ops->clear_stats(tcon);
                                }
                        }
                }
@@ -356,42 +342,10 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
                                seq_printf(m, "\n%d) %s", i, tcon->treeName);
                                if (tcon->need_reconnect)
                                        seq_puts(m, "\tDISCONNECTED ");
-                               seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
-                                       atomic_read(&tcon->num_smbs_sent),
-                                       atomic_read(&tcon->num_oplock_brks));
-                               seq_printf(m, "\nReads:  %d Bytes: %lld",
-                                       atomic_read(&tcon->num_reads),
-                                       (long long)(tcon->bytes_read));
-                               seq_printf(m, "\nWrites: %d Bytes: %lld",
-                                       atomic_read(&tcon->num_writes),
-                                       (long long)(tcon->bytes_written));
-                               seq_printf(m, "\nFlushes: %d",
-                                       atomic_read(&tcon->num_flushes));
-                               seq_printf(m, "\nLocks: %d HardLinks: %d "
-                                             "Symlinks: %d",
-                                       atomic_read(&tcon->num_locks),
-                                       atomic_read(&tcon->num_hardlinks),
-                                       atomic_read(&tcon->num_symlinks));
-                               seq_printf(m, "\nOpens: %d Closes: %d "
-                                             "Deletes: %d",
-                                       atomic_read(&tcon->num_opens),
-                                       atomic_read(&tcon->num_closes),
-                                       atomic_read(&tcon->num_deletes));
-                               seq_printf(m, "\nPosix Opens: %d "
-                                             "Posix Mkdirs: %d",
-                                       atomic_read(&tcon->num_posixopens),
-                                       atomic_read(&tcon->num_posixmkdirs));
-                               seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
-                                       atomic_read(&tcon->num_mkdirs),
-                                       atomic_read(&tcon->num_rmdirs));
-                               seq_printf(m, "\nRenames: %d T2 Renames %d",
-                                       atomic_read(&tcon->num_renames),
-                                       atomic_read(&tcon->num_t2renames));
-                               seq_printf(m, "\nFindFirst: %d FNext %d "
-                                             "FClose %d",
-                                       atomic_read(&tcon->num_ffirst),
-                                       atomic_read(&tcon->num_fnext),
-                                       atomic_read(&tcon->num_fclose));
+                               seq_printf(m, "\nSMBs: %d",
+                                          atomic_read(&tcon->num_smbs_sent));
+                               if (server->ops->print_stats)
+                                       server->ops->print_stats(m, tcon);
                        }
                }
        }