diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /fs/cifs | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index d9567ba2960b..47f2621001e4 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -1386,7 +1386,7 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from) | |||
| 1386 | if (!page) | 1386 | if (!page) |
| 1387 | return -ENOMEM; | 1387 | return -ENOMEM; |
| 1388 | 1388 | ||
| 1389 | zero_user_page(page, offset, PAGE_CACHE_SIZE - offset, KM_USER0); | 1389 | zero_user_segment(page, offset, PAGE_CACHE_SIZE); |
| 1390 | unlock_page(page); | 1390 | unlock_page(page); |
| 1391 | page_cache_release(page); | 1391 | page_cache_release(page); |
| 1392 | return rc; | 1392 | return rc; |