hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CIFS: Fix wsize usage in writepages 

If a server change maximum buffer size for write (wsize) requests
on reconnect we can fail on repeating with a big size buffer on
-EAGAIN error in writepages. Fix this by checking wsize all the
time before repeating request in writepages.

Reviewed-by: Shirish Pargaonkar <spargaonkar@suse.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2014-06-19 16:15:16 +04:00 committed by Steve French
parent 90ac1387c2
commit 66231a4796
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/cifs/file.c
View File

@ -2009,19 +2009,17 @@ wdata_send_pages(struct cifs_writedata *wdata, unsigned int nr_pages,
(loff_t)PAGE_CACHE_SIZE); (loff_t)PAGE_CACHE_SIZE);
wdata->bytes = ((nr_pages - 1) * PAGE_CACHE_SIZE) + wdata->tailsz; wdata->bytes = ((nr_pages - 1) * PAGE_CACHE_SIZE) + wdata->tailsz;
do { if (wdata->cfile != NULL)
if (wdata->cfile != NULL) cifsFileInfo_put(wdata->cfile);
cifsFileInfo_put(wdata->cfile); wdata->cfile = find_writable_file(CIFS_I(mapping->host), false);
wdata->cfile = find_writable_file(CIFS_I(mapping->host), false); if (!wdata->cfile) {
if (!wdata->cfile) { cifs_dbg(VFS, "No writable handles for inode\n");
cifs_dbg(VFS, "No writable handles for inode\n"); rc = -EBADF;
rc = -EBADF; } else {
break;
}
wdata->pid = wdata->cfile->pid; wdata->pid = wdata->cfile->pid;
server = tlink_tcon(wdata->cfile->tlink)->ses->server; server = tlink_tcon(wdata->cfile->tlink)->ses->server;
rc = server->ops->async_writev(wdata, cifs_writedata_release); rc = server->ops->async_writev(wdata, cifs_writedata_release);
} while (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN); }
for (i = 0; i < nr_pages; ++i) for (i = 0; i < nr_pages; ++i)
unlock_page(wdata->pages[i]); unlock_page(wdata->pages[i]);
@ -2058,7 +2056,7 @@ static int cifs_writepages(struct address_space *mapping,
retry: retry:
while (!done && index <= end) { while (!done && index <= end) {
unsigned int i, nr_pages, found_pages; unsigned int i, nr_pages, found_pages;
pgoff_t next = 0, tofind; pgoff_t next = 0, tofind, saved_index = index;
tofind = min((cifs_sb->wsize / PAGE_CACHE_SIZE) - 1, tofind = min((cifs_sb->wsize / PAGE_CACHE_SIZE) - 1,
end - index) + 1; end - index) + 1;
@ -2102,6 +2100,11 @@ retry:
} }
kref_put(&wdata->refcount, cifs_writedata_release); kref_put(&wdata->refcount, cifs_writedata_release);
if (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN) {
index = saved_index;
continue;
}
wbc->nr_to_write -= nr_pages; wbc->nr_to_write -= nr_pages;
if (wbc->nr_to_write <= 0) if (wbc->nr_to_write <= 0)
done = true; done = true;