summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-01 08:30:05 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-01 08:30:05 -0800
commitdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (patch)
tree0e20a92f62de2ad4e2aa56006f0e70864f6085a9
parent541ab4af11d5b41b95cd633e9b1d96cea9947ac2 (diff)
parent94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (diff)
downloadblackbird-op-linux-df70b17f88a4d1d8545d3569a1f6d28c6004f9e4.tar.gz
blackbird-op-linux-df70b17f88a4d1d8545d3569a1f6d28c6004f9e4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
-rw-r--r--fs/ntfs/file.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index cf3e6ced2d01..727533891813 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -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) {
OpenPOWER on IntegriCloud