diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-16 16:19:49 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-16 16:19:49 -0500 |
| commit | 4da00fd1b948b408f76488c4e506af748be5fce8 (patch) | |
| tree | 791b8de9fa6fa9a651abdf4009f9b9ed000c0787 /fs/nfs/file.c | |
| parent | f0bb5aaf2c51267c49ed5e2c6103df22acfe30f5 (diff) | |
| parent | 04fff6416cb7876091f0b2f413caf43e3618d5ad (diff) | |
Merge branch 'work.write_end' into for-linus
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 9ea85ae23c32..a1de8ef63e56 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -374,7 +374,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, |