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/ntfs/file.c | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ntfs/file.c')
| -rw-r--r-- | fs/ntfs/file.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 6cd08dfdc2ed..3c5550cd11d6 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
| @@ -607,8 +607,8 @@ do_next_page: | |||
| 607 | ntfs_submit_bh_for_read(bh); | 607 | ntfs_submit_bh_for_read(bh); |
| 608 | *wait_bh++ = bh; | 608 | *wait_bh++ = bh; |
| 609 | } else { | 609 | } else { |
| 610 | zero_user_page(page, bh_offset(bh), | 610 | zero_user(page, bh_offset(bh), |
| 611 | blocksize, KM_USER0); | 611 | blocksize); |
| 612 | set_buffer_uptodate(bh); | 612 | set_buffer_uptodate(bh); |
| 613 | } | 613 | } |
| 614 | } | 614 | } |
| @@ -683,9 +683,8 @@ map_buffer_cached: | |||
| 683 | ntfs_submit_bh_for_read(bh); | 683 | ntfs_submit_bh_for_read(bh); |
| 684 | *wait_bh++ = bh; | 684 | *wait_bh++ = bh; |
| 685 | } else { | 685 | } else { |
| 686 | zero_user_page(page, | 686 | zero_user(page, bh_offset(bh), |
| 687 | bh_offset(bh), | 687 | blocksize); |
| 688 | blocksize, KM_USER0); | ||
| 689 | set_buffer_uptodate(bh); | 688 | set_buffer_uptodate(bh); |
| 690 | } | 689 | } |
| 691 | } | 690 | } |
| @@ -703,8 +702,8 @@ map_buffer_cached: | |||
| 703 | */ | 702 | */ |
| 704 | if (bh_end <= pos || bh_pos >= end) { | 703 | if (bh_end <= pos || bh_pos >= end) { |
| 705 | if (!buffer_uptodate(bh)) { | 704 | if (!buffer_uptodate(bh)) { |
| 706 | zero_user_page(page, bh_offset(bh), | 705 | zero_user(page, bh_offset(bh), |
| 707 | blocksize, KM_USER0); | 706 | blocksize); |
| 708 | set_buffer_uptodate(bh); | 707 | set_buffer_uptodate(bh); |
| 709 | } | 708 | } |
| 710 | mark_buffer_dirty(bh); | 709 | mark_buffer_dirty(bh); |
| @@ -743,8 +742,7 @@ map_buffer_cached: | |||
| 743 | if (!buffer_uptodate(bh)) | 742 | if (!buffer_uptodate(bh)) |
| 744 | set_buffer_uptodate(bh); | 743 | set_buffer_uptodate(bh); |
| 745 | } else if (!buffer_uptodate(bh)) { | 744 | } else if (!buffer_uptodate(bh)) { |
| 746 | zero_user_page(page, bh_offset(bh), blocksize, | 745 | zero_user(page, bh_offset(bh), blocksize); |
| 747 | KM_USER0); | ||
| 748 | set_buffer_uptodate(bh); | 746 | set_buffer_uptodate(bh); |
| 749 | } | 747 | } |
| 750 | continue; | 748 | continue; |
| @@ -868,8 +866,8 @@ rl_not_mapped_enoent: | |||
| 868 | if (!buffer_uptodate(bh)) | 866 | if (!buffer_uptodate(bh)) |
| 869 | set_buffer_uptodate(bh); | 867 | set_buffer_uptodate(bh); |
| 870 | } else if (!buffer_uptodate(bh)) { | 868 | } else if (!buffer_uptodate(bh)) { |
| 871 | zero_user_page(page, bh_offset(bh), | 869 | zero_user(page, bh_offset(bh), |
| 872 | blocksize, KM_USER0); | 870 | blocksize); |
| 873 | set_buffer_uptodate(bh); | 871 | set_buffer_uptodate(bh); |
| 874 | } | 872 | } |
| 875 | continue; | 873 | continue; |
| @@ -1128,8 +1126,8 @@ rl_not_mapped_enoent: | |||
| 1128 | 1126 | ||
| 1129 | if (likely(bh_pos < initialized_size)) | 1127 | if (likely(bh_pos < initialized_size)) |
| 1130 | ofs = initialized_size - bh_pos; | 1128 | ofs = initialized_size - bh_pos; |
| 1131 | zero_user_page(page, bh_offset(bh) + ofs, | 1129 | zero_user_segment(page, bh_offset(bh) + ofs, |
| 1132 | blocksize - ofs, KM_USER0); | 1130 | blocksize); |
| 1133 | } | 1131 | } |
| 1134 | } else /* if (unlikely(!buffer_uptodate(bh))) */ | 1132 | } else /* if (unlikely(!buffer_uptodate(bh))) */ |
| 1135 | err = -EIO; | 1133 | err = -EIO; |
| @@ -1269,8 +1267,8 @@ rl_not_mapped_enoent: | |||
| 1269 | if (PageUptodate(page)) | 1267 | if (PageUptodate(page)) |
| 1270 | set_buffer_uptodate(bh); | 1268 | set_buffer_uptodate(bh); |
| 1271 | else { | 1269 | else { |
| 1272 | zero_user_page(page, bh_offset(bh), | 1270 | zero_user(page, bh_offset(bh), |
| 1273 | blocksize, KM_USER0); | 1271 | blocksize); |
| 1274 | set_buffer_uptodate(bh); | 1272 | set_buffer_uptodate(bh); |
| 1275 | } | 1273 | } |
| 1276 | } | 1274 | } |
| @@ -1330,7 +1328,7 @@ err_out: | |||
| 1330 | len = PAGE_CACHE_SIZE; | 1328 | len = PAGE_CACHE_SIZE; |
| 1331 | if (len > bytes) | 1329 | if (len > bytes) |
| 1332 | len = bytes; | 1330 | len = bytes; |
| 1333 | zero_user_page(*pages, 0, len, KM_USER0); | 1331 | zero_user(*pages, 0, len); |
| 1334 | } | 1332 | } |
| 1335 | goto out; | 1333 | goto out; |
| 1336 | } | 1334 | } |
| @@ -1451,7 +1449,7 @@ err_out: | |||
| 1451 | len = PAGE_CACHE_SIZE; | 1449 | len = PAGE_CACHE_SIZE; |
| 1452 | if (len > bytes) | 1450 | if (len > bytes) |
| 1453 | len = bytes; | 1451 | len = bytes; |
| 1454 | zero_user_page(*pages, 0, len, KM_USER0); | 1452 | zero_user(*pages, 0, len); |
| 1455 | } | 1453 | } |
| 1456 | goto out; | 1454 | goto out; |
| 1457 | } | 1455 | } |