1 files changed, 27 insertions, 27 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index fe30bb5dd2d8..cabc7a01f5df 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -893,7 +893,7 @@ PsxDelete:
                 cFYI(1, "Posix delete returned %d", rc);
         cifs_buf_release(pSMB);
 
-        cifs_stats_inc(&tcon->num_deletes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_deletes);
 
         if (rc == -EAGAIN)
                 goto PsxDelete;
@@ -936,7 +936,7 @@ DelFileRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_deletes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_deletes);
         if (rc)
                 cFYI(1, "Error in RMFile = %d", rc);
 
@@ -981,7 +981,7 @@ RmDirRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_rmdirs);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_rmdirs);
         if (rc)
                 cFYI(1, "Error in RMDir = %d", rc);
 
@@ -1024,7 +1024,7 @@ MkDirRetry:
         pSMB->ByteCount = cpu_to_le16(name_len + 1);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_mkdirs);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_mkdirs);
         if (rc)
                 cFYI(1, "Error in Mkdir = %d", rc);
 
@@ -1147,9 +1147,9 @@ psx_create_err:
         cifs_buf_release(pSMB);
 
         if (posix_flags & SMB_O_DIRECTORY)
-                cifs_stats_inc(&tcon->num_posixmkdirs);
+                cifs_stats_inc(&tcon->stats.cifs_stats.num_posixmkdirs);
         else
-                cifs_stats_inc(&tcon->num_posixopens);
+                cifs_stats_inc(&tcon->stats.cifs_stats.num_posixopens);
 
         if (rc == -EAGAIN)
                 goto PsxCreat;
@@ -1270,7 +1270,7 @@ OldOpenRetry:
         /* long_op set to 1 to allow for oplock break timeouts */
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *)pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_opens);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_opens);
         if (rc) {
                 cFYI(1, "Error in Open = %d", rc);
         } else {
@@ -1383,7 +1383,7 @@ openRetry:
         /* long_op set to 1 to allow for oplock break timeouts */
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *)pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_opens);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_opens);
         if (rc) {
                 cFYI(1, "Error in Open = %d", rc);
         } else {
@@ -1650,7 +1650,7 @@ cifs_async_readv(struct cifs_readdata *rdata)
                              rdata, 0);
 
         if (rc == 0)
-                cifs_stats_inc(&tcon->num_reads);
+                cifs_stats_inc(&tcon->stats.cifs_stats.num_reads);
         else
                 kref_put(&rdata->refcount, cifs_readdata_release);
 
@@ -1720,7 +1720,7 @@ CIFSSMBRead(const unsigned int xid, struct cifs_io_parms *io_parms,
         iov[0].iov_len = be32_to_cpu(pSMB->hdr.smb_buf_length) + 4;
         rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovecs */,
                          &resp_buf_type, CIFS_LOG_ERROR);
-        cifs_stats_inc(&tcon->num_reads);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_reads);
         pSMBr = (READ_RSP *)iov[0].iov_base;
         if (rc) {
                 cERROR(1, "Send error in read = %d", rc);
@@ -1872,7 +1872,7 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
-        cifs_stats_inc(&tcon->num_writes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
         if (rc) {
                 cFYI(1, "Send error in write = %d", rc);
         } else {
@@ -2123,7 +2123,7 @@ cifs_async_writev(struct cifs_writedata *wdata)
                              NULL, cifs_writev_callback, wdata, 0);
 
         if (rc == 0)
-                cifs_stats_inc(&tcon->num_writes);
+                cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
         else
                 kref_put(&wdata->refcount, cifs_writedata_release);
 
@@ -2213,7 +2213,7 @@ CIFSSMBWrite2(const unsigned int xid, struct cifs_io_parms *io_parms,
 
         rc = SendReceive2(xid, tcon->ses, iov, n_vec + 1, &resp_buf_type,
                           long_op);
-        cifs_stats_inc(&tcon->num_writes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
         if (rc) {
                 cFYI(1, "Send error Write2 = %d", rc);
         } else if (resp_buf_type == 0) {
@@ -2279,7 +2279,7 @@ int cifs_lockv(const unsigned int xid, struct cifs_tcon *tcon,
         iov[1].iov_base = (char *)buf;
         iov[1].iov_len = (num_unlock + num_lock) * sizeof(LOCKING_ANDX_RANGE);
 
-        cifs_stats_inc(&tcon->num_locks);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
         rc = SendReceive2(xid, tcon->ses, iov, 2, &resp_buf_type, CIFS_NO_RESP);
         if (rc)
                 cFYI(1, "Send error in cifs_lockv = %d", rc);
@@ -2348,7 +2348,7 @@ CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon,
                 rc = SendReceiveNoRsp(xid, tcon->ses, (char *)pSMB, flags);
                 /* SMB buffer freed by function above */
         }
-        cifs_stats_inc(&tcon->num_locks);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
         if (rc)
                 cFYI(1, "Send error in Lock = %d", rc);
 
@@ -2511,7 +2511,7 @@ CIFSSMBClose(const unsigned int xid, struct cifs_tcon *tcon, int smb_file_id)
         pSMB->LastWriteTime = 0xFFFFFFFF;
         pSMB->ByteCount = 0;
         rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
-        cifs_stats_inc(&tcon->num_closes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_closes);
         if (rc) {
                 if (rc != -EINTR) {
                         /* EINTR is expected when user ctl-c to kill app */
@@ -2540,7 +2540,7 @@ CIFSSMBFlush(const unsigned int xid, struct cifs_tcon *tcon, int smb_file_id)
         pSMB->FileID = (__u16) smb_file_id;
         pSMB->ByteCount = 0;
         rc = SendReceiveNoRsp(xid, tcon->ses, (char *) pSMB, 0);
-        cifs_stats_inc(&tcon->num_flushes);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_flushes);
         if (rc)
                 cERROR(1, "Send error in Flush = %d", rc);
 
@@ -2603,7 +2603,7 @@ renameRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_renames);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_renames);
         if (rc)
                 cFYI(1, "Send error in rename = %d", rc);
 
@@ -2684,7 +2684,7 @@ int CIFSSMBRenameOpenFile(const unsigned int xid, struct cifs_tcon *pTcon,
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, pTcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&pTcon->num_t2renames);
+        cifs_stats_inc(&pTcon->stats.cifs_stats.num_t2renames);
         if (rc)
                 cFYI(1, "Send error in Rename (by file handle) = %d", rc);
 
@@ -2841,7 +2841,7 @@ createSymLinkRetry:
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_symlinks);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_symlinks);
         if (rc)
                 cFYI(1, "Send error in SetPathInfo create symlink = %d", rc);
 
@@ -2927,7 +2927,7 @@ createHardLinkRetry:
         pSMB->ByteCount = cpu_to_le16(byte_count);
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_hardlinks);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_hardlinks);
         if (rc)
                 cFYI(1, "Send error in SetPathInfo (hard link) = %d", rc);
 
@@ -2999,7 +2999,7 @@ winCreateHardLinkRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_hardlinks);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_hardlinks);
         if (rc)
                 cFYI(1, "Send error in hard link (NT rename) = %d", rc);
 
@@ -3417,7 +3417,7 @@ queryAclRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_acl_get);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_acl_get);
         if (rc) {
                 cFYI(1, "Send error in Query POSIX ACL = %d", rc);
         } else {
@@ -3728,7 +3728,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
 
         rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovec */, &buf_type,
                          0);
-        cifs_stats_inc(&tcon->num_acl_get);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_acl_get);
         if (rc) {
                 cFYI(1, "Send error in QuerySecDesc = %d", rc);
         } else {                /* decode response */
@@ -4330,7 +4330,7 @@ findFirstRetry:
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                          (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_ffirst);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_ffirst);
 
         if (rc) {/* BB add logic to retry regular search if Unix search
                         rejected unexpectedly by server */
@@ -4457,7 +4457,7 @@ int CIFSFindNext(const unsigned int xid, struct cifs_tcon *tcon,
 
         rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                         (struct smb_hdr *) pSMBr, &bytes_returned, 0);
-        cifs_stats_inc(&tcon->num_fnext);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_fnext);
         if (rc) {
                 if (rc == -EBADF) {
                         psrch_inf->endOfSearch = true;
@@ -4548,7 +4548,7 @@ CIFSFindClose(const unsigned int xid, struct cifs_tcon *tcon,
         if (rc)
                 cERROR(1, "Send error in FindClose = %d", rc);
 
-        cifs_stats_inc(&tcon->num_fclose);
+        cifs_stats_inc(&tcon->stats.cifs_stats.num_fclose);
 
         /* Since session is dead, search handle closed on server already */
         if (rc == -EAGAIN)