From: Chris Wright Date: Tue, 20 Jun 2006 10:21:37 +0000 (-0700) Subject: Add NTFS fix for 2.6.16 queue X-Git-Tag: v2.6.16.22~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9ddb1c85b4f2e36b4e3327d851c119af3ec2a93;p=thirdparty%2Fkernel%2Fstable-queue.git Add NTFS fix for 2.6.16 queue --- diff --git a/queue-2.6.16/ntfs-critical-bug-fix.patch b/queue-2.6.16/ntfs-critical-bug-fix.patch new file mode 100644 index 00000000000..3ee3d63aa11 --- /dev/null +++ b/queue-2.6.16/ntfs-critical-bug-fix.patch @@ -0,0 +1,50 @@ +From stable-bounces@linux.kernel.org Tue Jun 20 00:30:20 2006 +Date: Tue, 20 Jun 2006 00:29:41 -0700 +From: akpm@osdl.org +To: aia21@cam.ac.uk, aia21@cantab.net, stable@kernel.org +Cc: +Subject: NTFS: Critical bug fix (affects MIPS and possibly others) + +From: Anton Altaparmakov + +It fixes a crash in NTFS on architectures where flush_dcache_page() +is a real function. I never noticed this as all my testing is done on +i386 where flush_dcache_page() is NULL. + +http://bugzilla.kernel.org/show_bug.cgi?id=6700 + +Many thanks to Pauline Ng for the detailed bug report and analysis! + +Signed-off-by: Anton Altaparmakov +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Chris Wright +--- + + fs/ntfs/file.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +--- linux-2.6.16.21.orig/fs/ntfs/file.c ++++ linux-2.6.16.21/fs/ntfs/file.c +@@ -1489,14 +1489,15 @@ static inline void ntfs_flush_dcache_pag + unsigned nr_pages) + { + BUG_ON(!nr_pages); ++ /* ++ * Warning: Do not do the decrement at the same time as the call to ++ * flush_dcache_page() because it is a NULL macro on i386 and hence the ++ * decrement never happens so the loop never terminates. ++ */ + do { +- /* +- * Warning: Do not do the decrement at the same time as the +- * call because flush_dcache_page() is a NULL macro on i386 +- * and hence the decrement never happens. +- */ ++ --nr_pages; + flush_dcache_page(pages[nr_pages]); +- } while (--nr_pages > 0); ++ } while (nr_pages > 0); + } + + /** diff --git a/queue-2.6.16/series b/queue-2.6.16/series index e0b81a963bd..8c8a3b1e25d 100644 --- a/queue-2.6.16/series +++ b/queue-2.6.16/series @@ -10,3 +10,4 @@ jfs-fix-multiple-errors-in-metapage_releasepage.patch scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch i2o-bugfixes-to-get-i2o-working-again.patch powernow-k8-crash-workaround.patch +ntfs-critical-bug-fix.patch