The patch titled FS-Cache: AFS: Fix up AFS filesystem caching patch has been added to the -mm tree. Its filename is fs-cache-make-kafs-use-fs-cache-12-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: FS-Cache: AFS: Fix up AFS filesystem caching patch From: David Howells <dhowells@xxxxxxxxxx> Fix up the AFS filesystem caching patch for when caching is disabled. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/afs/file.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) diff -puN fs/afs/file.c~fs-cache-make-kafs-use-fs-cache-12-fix fs/afs/file.c --- a/fs/afs/file.c~fs-cache-make-kafs-use-fs-cache-12-fix +++ a/fs/afs/file.c @@ -323,13 +323,15 @@ static int afs_file_releasepage(struct p { _enter("{%lu},%x", page->index, gfp_flags); - /* deny */ +#ifdef CONFIG_AFS_FSCACHE + /* deny if page is being written to the cache */ if (PageFsMisc(page)) { _leave(" = F"); return 0; } fscache_uncache_page(AFS_FS_I(page->mapping->host)->cache, page); +#endif /* indicate that the page can be released */ _leave(" = T"); _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are git-gfs2.patch git-nfs.patch nfs-replace-null-dentries-that-appear-in-readdirs-list-2.patch nfs-fix-up-warnings.patch binfmt_elf-consistently-use-loff_t.patch afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch elf_fdpic_core_dump-dont-take-tasklist_lock.patch reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch fs-cache-generic-filesystem-caching-facility.patch fs-cache-release-page-private-in-failed-readahead.patch fs-cache-release-page-private-after-failed-readahead-12.patch fs-cache-make-kafs-use-fs-cache.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-12.patch fs-cache-make-kafs-use-fs-cache-12-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching.patch nfs-use-local-caching-12.patch nfs-use-local-caching-12-fix.patch fs-cache-cachefiles-ia64-missing-copy_page-export.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch ecryptfs-get_sb_dev-fix.patch reiser4-get_sb_dev-fix.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html