OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Pavel Shilovsky 2014-07-10 10:03:29 +04:00 committed by Steve French
parent 3fabaa2746
commit 34a54d6177
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/cifs/cifsglob.h
View File

@ -1059,6 +1059,7 @@ struct cifs_readdata {
struct address_space *mapping; struct address_space *mapping;
__u64 offset; __u64 offset;
unsigned int bytes; unsigned int bytes;
unsigned int got_bytes;
pid_t pid; pid_t pid;
int result; int result;
struct work_struct work; struct work_struct work;

6
fs/cifs/cifssmb.c
View File

@ -1513,7 +1513,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
return length; return length;
server->total_read += length; server->total_read += length;
rdata->bytes = length; rdata->got_bytes = length;
cifs_dbg(FYI, "total_read=%u buflen=%u remaining=%u\n", cifs_dbg(FYI, "total_read=%u buflen=%u remaining=%u\n",
server->total_read, buflen, data_len); server->total_read, buflen, data_len);
@ -1556,8 +1556,8 @@ cifs_readv_callback(struct mid_q_entry *mid)
rc); rc);
} }
/* FIXME: should this be counted toward the initiating task? */ /* FIXME: should this be counted toward the initiating task? */
task_io_account_read(rdata->bytes); task_io_account_read(rdata->got_bytes);
cifs_stats_bytes_read(tcon, rdata->bytes); cifs_stats_bytes_read(tcon, rdata->got_bytes);
break; break;
case MID_REQUEST_SUBMITTED: case MID_REQUEST_SUBMITTED:
case MID_RETRY_NEEDED: case MID_RETRY_NEEDED:

2
fs/cifs/file.c
View File

@ -2840,7 +2840,7 @@ cifs_uncached_readdata_release(struct kref *refcount)
static int static int
cifs_readdata_to_iov(struct cifs_readdata *rdata, struct iov_iter *iter) cifs_readdata_to_iov(struct cifs_readdata *rdata, struct iov_iter *iter)
{ {
size_t remaining = rdata->bytes; size_t remaining = rdata->got_bytes;
unsigned int i; unsigned int i;
for (i = 0; i < rdata->nr_pages; i++) { for (i = 0; i < rdata->nr_pages; i++) {

4
fs/cifs/smb2pdu.c
View File

@ -1723,8 +1723,8 @@ smb2_readv_callback(struct mid_q_entry *mid)
rc); rc);
} }
/* FIXME: should this be counted toward the initiating task? */ /* FIXME: should this be counted toward the initiating task? */
task_io_account_read(rdata->bytes); task_io_account_read(rdata->got_bytes);
cifs_stats_bytes_read(tcon, rdata->bytes); cifs_stats_bytes_read(tcon, rdata->got_bytes);
break; break;
case MID_REQUEST_SUBMITTED: case MID_REQUEST_SUBMITTED:
case MID_RETRY_NEEDED: case MID_RETRY_NEEDED: