korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 01:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6

Browse Source
This commit is contained in:
Linus Torvalds 2005-11-01 08:30:05 -08:00
commit df70b17f88
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ntfs/file.c
View File

@ -668,10 +668,10 @@ map_buffer_cached:
* to, we need to read it in before the write,
* i.e. now.
*/
if (!buffer_uptodate(bh) && ((bh_pos < pos &&
bh_end > pos) ||
(bh_end > end &&
bh_end > end))) {
if (!buffer_uptodate(bh) && bh_pos < end &&
bh_end > pos &&
(bh_pos < pos ||
bh_end > end)) {
/*
* If the buffer is fully or partially
* within the initialized size, do an
@ -784,10 +784,11 @@ retry_remap:
blocksize_bits);
cdelta = 0;
/*
* If the number of remaining clusters in the
* @pages is smaller or equal to the number of
* cached clusters, unlock the runlist as the
* map cache will be used from now on.
* If the number of remaining clusters touched
* by the write is smaller or equal to the
* number of cached clusters, unlock the
* runlist as the map cache will be used from
* now on.
*/
if (likely(vcn + vcn_len >= cend)) {
if (rl_write_locked) {