]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
smb3: fix reset of bytes read and written stats
authorSteve French <stfrench@microsoft.com>
Wed, 1 Aug 2018 05:56:12 +0000 (00:56 -0500)
committerSteve French <stfrench@microsoft.com>
Tue, 7 Aug 2018 19:20:22 +0000 (14:20 -0500)
echo 0 > /proc/fs/cifs/Stats is supposed to reset the stats
but there were four (see example below) that were not reset
(bytes read and witten, total vfs ops and max ops
at one time).

...
0 session 0 share reconnects
Total vfs operations: 100 maximum at one time: 2

1) \\localhost\test
SMBs: 0
Bytes read: 502092  Bytes written: 31457286
TreeConnects: 0 total 0 failed
TreeDisconnects: 0 total 0 failed
...

This patch fixes cifs_stats_proc_write to properly reset
those four.

Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
fs/cifs/cifs_debug.c

index 3270d9b746030758cef1998a47677e25d915cab3..e074820bd4ed7664e09f786c0bf9caa4e469baa3 100644 (file)
@@ -381,6 +381,10 @@ static ssize_t cifs_stats_proc_write(struct file *file,
                atomic_set(&totBufAllocCount, 0);
                atomic_set(&totSmBufAllocCount, 0);
 #endif /* CONFIG_CIFS_STATS2 */
+               spin_lock(&GlobalMid_Lock);
+               GlobalMaxActiveXid = 0;
+               GlobalCurrentXid = 0;
+               spin_unlock(&GlobalMid_Lock);
                spin_lock(&cifs_tcp_ses_lock);
                list_for_each(tmp1, &cifs_tcp_ses_list) {
                        server = list_entry(tmp1, struct TCP_Server_Info,
@@ -393,6 +397,10 @@ static ssize_t cifs_stats_proc_write(struct file *file,
                                                          struct cifs_tcon,
                                                          tcon_list);
                                        atomic_set(&tcon->num_smbs_sent, 0);
+                                       spin_lock(&tcon->stat_lock);
+                                       tcon->bytes_read = 0;
+                                       tcon->bytes_written = 0;
+                                       spin_unlock(&tcon->stat_lock);
                                        if (server->ops->clear_stats)
                                                server->ops->clear_stats(tcon);
                                }