The patch titled FS-Cache: AFS: Fix up AFS filesystem caching patch has been removed from the -mm tree. Its filename was fs-cache-make-kafs-use-fs-cache-12-fix.patch This patch was dropped because it is obsolete ------------------------------------------------------ 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 file 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 @@ -322,13 +322,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 origin.patch nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch security-keys-user-kmemdup.patch log2-implement-a-general-integer-log2-facility-in-the-kernel.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-ppc-fix.patch log2-alter-roundup_pow_of_two-so-that-it-can-use-a-ilog2-on-a-constant.patch log2-alter-get_order-so-that-it-can-make-use-of-ilog2-on-a-constant.patch log2-provide-ilog2-fallbacks-for-powerpc.patch fs-cache-make-kafs-use-fs-cache-12-fix.patch fs-cache-make-kafs-use-fs-cache-kconfig-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 nfs-use-local-caching-kconfig-fix.patch nfs-use-local-caching-configh.patch add-missing-page_copy-export-for-ppc-and-powerpc.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-fscache-fix-gfp_t-sparse-annotations.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice.patch fscache-kconfig-tidying.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-handle-enospc-on-create-mkdir-better.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-inode-count-maintenance.patch afs-amend-the-afs-configuration-options.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