From 3aebf25bdcf030f3e4afeb9340486d5b46deb46e Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Tue, 1 Nov 2005 15:49:31 +0000 Subject: NTFS: Fix a stupid bug causing writes to non-initialized pages to segfault. Signed-off-by: Anton Altaparmakov --- fs/ntfs/file.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'fs/ntfs/file.c') diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index cf3e6ced2d0..72753389181 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) { -- cgit v1.2.3