Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / fs / cifs / smb1ops.c

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 7195fadf1cfaeb6dd5f59ca7f609a7a23a1742a1..c40356d24c5ce8dd235bd3e8e7e632d06ac29613 100644 (file)
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -520,10 +520,77 @@ cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
        return full_path;
 }
 
+static void
+cifs_clear_stats(struct cifs_tcon *tcon)
+{
+#ifdef CONFIG_CIFS_STATS
+       atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
+       atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
+#endif
+}
+
+static void
+cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
+{
+#ifdef CONFIG_CIFS_STATS
+       seq_printf(m, " Oplocks breaks: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
+       seq_printf(m, "\nReads:  %d Bytes: %llu",
+                  atomic_read(&tcon->stats.cifs_stats.num_reads),
+                  (long long)(tcon->bytes_read));
+       seq_printf(m, "\nWrites: %d Bytes: %llu",
+                  atomic_read(&tcon->stats.cifs_stats.num_writes),
+                  (long long)(tcon->bytes_written));
+       seq_printf(m, "\nFlushes: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_flushes));
+       seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_locks),
+                  atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
+                  atomic_read(&tcon->stats.cifs_stats.num_symlinks));
+       seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_opens),
+                  atomic_read(&tcon->stats.cifs_stats.num_closes),
+                  atomic_read(&tcon->stats.cifs_stats.num_deletes));
+       seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_posixopens),
+                  atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
+       seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
+                  atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
+       seq_printf(m, "\nRenames: %d T2 Renames %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_renames),
+                  atomic_read(&tcon->stats.cifs_stats.num_t2renames));
+       seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
+                  atomic_read(&tcon->stats.cifs_stats.num_ffirst),
+                  atomic_read(&tcon->stats.cifs_stats.num_fnext),
+                  atomic_read(&tcon->stats.cifs_stats.num_fclose));
+#endif
+}
+
 struct smb_version_operations smb1_operations = {
        .send_cancel = send_nt_cancel,
        .compare_fids = cifs_compare_fids,
        .setup_request = cifs_setup_request,
+       .setup_async_request = cifs_setup_async_request,
        .check_receive = cifs_check_receive,
        .add_credits = cifs_add_credits,
        .set_credits = cifs_set_credits,
@@ -536,6 +603,8 @@ struct smb_version_operations smb1_operations = {
        .find_mid = cifs_find_mid,
        .check_message = checkSMB,
        .dump_detail = cifs_dump_detail,
+       .clear_stats = cifs_clear_stats,
+       .print_stats = cifs_print_stats,
        .is_oplock_break = is_valid_oplock_break,
        .check_trans2 = cifs_check_trans2,
        .need_neg = cifs_need_neg,
@@ -550,6 +619,7 @@ struct smb_version_operations smb1_operations = {
        .query_path_info = cifs_query_path_info,
        .get_srv_inum = cifs_get_srv_inum,
        .build_path_to_root = cifs_build_path_to_root,
+       .echo = CIFSSMBEcho,
 };
 
 struct smb_version_values smb1_values = {
@@ -562,4 +632,7 @@ struct smb_version_values smb1_values = {
        .max_header_size = MAX_CIFS_HDR_SIZE,
        .read_rsp_size = sizeof(READ_RSP),
        .lock_cmd = cpu_to_le16(SMB_COM_LOCKING_ANDX),
+       .cap_unix = CAP_UNIX,
+       .cap_nt_find = CAP_NT_SMBS | CAP_NT_FIND,
+       .cap_large_files = CAP_LARGE_FILES,
 };