summaryrefslogtreecommitdiff
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-21 05:00:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-21 05:00:55 -0700
commitce96e448b2a57a6ec43a91a24d1dbb3f5f4095e3 (patch)
tree4f3b6e1a6fa91d46f6265d3134418debd77848bc /fs/nfs/file.c
parentb23c3fca0596a7e23dc26cb54b719774eb7d3045 (diff)
parent78cbd38fd58116df6d09bfc6166cf57b90d0711d (diff)
Merge "Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4'"
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 93e236429c5d..dc875cd0e11d 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -407,7 +407,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,