commit 8ea7fff57e22d95788f0a2b3115687f77fd8099d Author: Greg Kroah-Hartman Date: Fri Nov 16 09:43:31 2007 -0800 Linux 2.6.23.7 commit 11170fcc31bde3c9752d9f4992a85ba1c05decaf Author: Trond Myklebust Date: Fri Oct 19 17:26:11 2007 -0400 NFS: Fix a writeback race... patch 61e930a904966cc37e0a3404276f0b73037e57ca in mainline This patch fixes a regression that was introduced by commit 44dd151d5c21234cc534c47d7382f5c28c3143cd We cannot zero the user page in nfs_mark_uptodate() any more, since a) We'd be modifying the page without holding the page lock b) We can race with other updates of the page, most notably because of the call to nfs_wb_page() in nfs_writepage_setup(). Instead, we do the zeroing in nfs_update_request() if we see that we're creating a request that might potentially be marked as up to date. Thanks to Olivier Paquet for reporting the bug and providing a test-case. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit 78fd2b3595b7c73b109154f1abe0f1d2b85dbbe6 Author: Mark Fasheh Date: Mon Nov 12 14:09:22 2007 -0800 ocfs2: fix write() performance regression patch 4e9563fd55ff4479f2b118d0757d121dd0cfc39c in mainline. ocfs2: fix write() performance regression On file systems which don't support sparse files, Ocfs2_map_page_blocks() was reading blocks on appending writes. This caused write performance to suffer dramatically. Fix this by detecting an appending write on a nonsparse fs and skipping the read. Signed-off-by: Mark Fasheh Signed-off-by: Greg Kroah-Hartman commit f0ae3188daf70ed07a4dfbeb133bef3a92838a15 Author: Eric Sandeen Date: Tue Oct 16 23:27:15 2007 -0700 minixfs: limit minixfs printks on corrupted dir i_size (CVE-2006-6058) patch f44ec6f3f89889a469773b1fd894f8fcc07c29cf upstream. This attempts to address CVE-2006-6058 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-6058 first reported at http://projects.info-pull.com/mokb/MOKB-17-11-2006.html Essentially a corrupted minix dir inode reporting a very large i_size will loop for a very long time in minix_readdir, minix_find_entry, etc, because on EIO they just move on to try the next page. This is under the BKL, printk-storming as well. This can lock up the machine for a very long time. Simply ratelimiting the printks gets things back under control. Make the message a bit more informative while we're here. Signed-off-by: Eric Sandeen Cc: Bodo Eggert <7eggert@gmx.de> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman