lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 49/78] smb3: fix reset of bytes read and written stats
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Steve French <stfrench@microsoft.com>

    [ Upstream commit c281bc0c7412308c7ec0888904f7c99353da4796 ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/cifs/cifs_debug.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/fs/cifs/cifs_debug.c
    +++ b/fs/cifs/cifs_debug.c
    @@ -284,6 +284,10 @@ static ssize_t cifs_stats_proc_write(str
    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,
    @@ -296,6 +300,10 @@ static ssize_t cifs_stats_proc_write(str
    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);
    }

    \
     
     \ /
      Last update: 2018-09-13 15:39    [W:5.100 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site