projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[linux]
/
fs
/
nfs
/
file.c
diff --git
a/fs/nfs/file.c
b/fs/nfs/file.c
index
599a602
..
157cb43
100644
(file)
--- a/
fs/nfs/file.c
+++ b/
fs/nfs/file.c
@@
-367,7
+367,7
@@
static int nfs_write_end(struct file *file, struct address_space *mapping,
*/
if (!PageUptodate(page)) {
unsigned pglen = nfs_page_length(page);
- unsigned end = offset +
len
;
+ unsigned end = offset +
copied
;
if (pglen == 0) {
zero_user_segments(page, 0, offset,