aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilovsky@samba.org>2014-07-10 02:03:29 -0400
committerSteve French <smfrench@gmail.com>2014-08-02 02:23:04 -0400
commit34a54d617785e5ecafe1605df7aa689ec193964c (patch)
treebd22b7234faca95e6eefb113ab5709a5952ef289 /fs/cifs/cifssmb.c
parent3fabaa274635231c01f3bd0d10c4d353aa200673 (diff)
CIFS: Use separate var for the number of bytes got in async read
and don't mix it with the number of bytes that was requested. Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 1b3f0aef01e3..1781a03aed5e 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1513,7 +1513,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
1513 return length; 1513 return length;
1514 1514
1515 server->total_read += length; 1515 server->total_read += length;
1516 rdata->bytes = length; 1516 rdata->got_bytes = length;
1517 1517
1518 cifs_dbg(FYI, "total_read=%u buflen=%u remaining=%u\n", 1518 cifs_dbg(FYI, "total_read=%u buflen=%u remaining=%u\n",
1519 server->total_read, buflen, data_len); 1519 server->total_read, buflen, data_len);
@@ -1556,8 +1556,8 @@ cifs_readv_callback(struct mid_q_entry *mid)
1556 rc); 1556 rc);
1557 } 1557 }
1558 /* FIXME: should this be counted toward the initiating task? */ 1558 /* FIXME: should this be counted toward the initiating task? */
1559 task_io_account_read(rdata->bytes); 1559 task_io_account_read(rdata->got_bytes);
1560 cifs_stats_bytes_read(tcon, rdata->bytes); 1560 cifs_stats_bytes_read(tcon, rdata->got_bytes);
1561 break; 1561 break;
1562 case MID_REQUEST_SUBMITTED: 1562 case MID_REQUEST_SUBMITTED:
1563 case MID_RETRY_NEEDED: 1563 case MID_RETRY_NEEDED: