niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages 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, * to, we need to read it in before the write,
* i.e. now. * i.e. now.
*/ */
if (!buffer_uptodate(bh) && ((bh_pos < pos && if (!buffer_uptodate(bh) && bh_pos < end &&
bh_end > pos) || bh_end > pos &&
(bh_end > end && (bh_pos < pos ||
bh_end > end))) { bh_end > end)) {
/* /*
* If the buffer is fully or partially * If the buffer is fully or partially
* within the initialized size, do an * within the initialized size, do an
@ -784,10 +784,11 @@ retry_remap:
blocksize_bits); blocksize_bits);
cdelta = 0; cdelta = 0;
/* /*
* If the number of remaining clusters in the * If the number of remaining clusters touched
* @pages is smaller or equal to the number of * by the write is smaller or equal to the
* cached clusters, unlock the runlist as the * number of cached clusters, unlock the
* map cache will be used from now on. * runlist as the map cache will be used from
* now on.
*/ */
if (likely(vcn + vcn_len >= cend)) { if (likely(vcn + vcn_len >= cend)) {
if (rl_write_locked) { if (rl_write_locked) {