diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
| commit | d28996d022a87e81bd6d4bedd5990b68d7e4d567 (patch) | |
| tree | 8b7a18ca2701b77a626a0e3c155d5e63a7fa99a6 /fs/nfs/file.c | |
| parent | ec54c473486f2addc56e99c1191e4975123930d7 (diff) | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-17.02-rt
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 2ab6f00dba5b..c85da0fc4593 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -410,7 +410,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, |