Commit 0cb012d1 authored by Steve French's avatar Steve French

cifs: track writepages in vfs operation counters

writepages and readpages operations did not call get/free_xid
so the statistics for file copy could get confusing with "vfs operations"
not increasing.  Add get_xid and free_xid to cifs readpages and
writepages functions.
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
parent f70556c8
...@@ -2107,6 +2107,7 @@ static int cifs_writepages(struct address_space *mapping, ...@@ -2107,6 +2107,7 @@ static int cifs_writepages(struct address_space *mapping,
pgoff_t end, index; pgoff_t end, index;
struct cifs_writedata *wdata; struct cifs_writedata *wdata;
int rc = 0; int rc = 0;
unsigned int xid;
/* /*
* If wsize is smaller than the page cache size, default to writing * If wsize is smaller than the page cache size, default to writing
...@@ -2115,6 +2116,7 @@ static int cifs_writepages(struct address_space *mapping, ...@@ -2115,6 +2116,7 @@ static int cifs_writepages(struct address_space *mapping,
if (cifs_sb->wsize < PAGE_SIZE) if (cifs_sb->wsize < PAGE_SIZE)
return generic_writepages(mapping, wbc); return generic_writepages(mapping, wbc);
xid = get_xid();
if (wbc->range_cyclic) { if (wbc->range_cyclic) {
index = mapping->writeback_index; /* Start from prev offset */ index = mapping->writeback_index; /* Start from prev offset */
end = -1; end = -1;
...@@ -2208,6 +2210,7 @@ static int cifs_writepages(struct address_space *mapping, ...@@ -2208,6 +2210,7 @@ static int cifs_writepages(struct address_space *mapping,
if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
mapping->writeback_index = index; mapping->writeback_index = index;
free_xid(xid);
return rc; return rc;
} }
...@@ -3752,7 +3755,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, ...@@ -3752,7 +3755,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file); struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
struct TCP_Server_Info *server; struct TCP_Server_Info *server;
pid_t pid; pid_t pid;
unsigned int xid;
xid = get_xid();
/* /*
* Reads as many pages as possible from fscache. Returns -ENOBUFS * Reads as many pages as possible from fscache. Returns -ENOBUFS
* immediately if the cookie is negative * immediately if the cookie is negative
...@@ -3762,8 +3767,10 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, ...@@ -3762,8 +3767,10 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
*/ */
rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list, rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list,
&num_pages); &num_pages);
if (rc == 0) if (rc == 0) {
free_xid(xid);
return rc; return rc;
}
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
pid = open_file->pid; pid = open_file->pid;
...@@ -3807,6 +3814,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, ...@@ -3807,6 +3814,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
*/ */
if (unlikely(rsize < PAGE_SIZE)) { if (unlikely(rsize < PAGE_SIZE)) {
add_credits_and_wake_if(server, credits, 0); add_credits_and_wake_if(server, credits, 0);
free_xid(xid);
return 0; return 0;
} }
...@@ -3871,6 +3879,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, ...@@ -3871,6 +3879,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
* allocator. * allocator.
*/ */
cifs_fscache_readpages_cancel(mapping->host, page_list); cifs_fscache_readpages_cancel(mapping->host, page_list);
free_xid(xid);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment