The patch titled
CacheFiles: cachefiles_write_page() shouldn't indicate error twice
has been removed from the -mm tree. Its filename was
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: CacheFiles: cachefiles_write_page() shouldn't indicate error twice
From: David Howells <dhowells@xxxxxxxxxx>
Prevent cachefiles_write_page() from issuing an error twice, instead
forgoing the callback if it can return the error directly.
Previously, the netfs was being informed of the error twice, once by the
error being passed to the netfs callback, and a second time when
fscache_write_page() returned to the netfs.
In NFS's case, this meant it attempted to do error handling twice,
including clearing PG_fs_misc twice...
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/cachefiles/cf-interface.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice fs/cachefiles/cf-interface.c
--- a/fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice
+++ a/fs/cachefiles/cf-interface.c
@@ -1247,9 +1247,11 @@ static int cachefiles_write_page(struct
"write page to backing file"
" failed");
ret = -ENOBUFS;
+ } else {
+ /* only invoke the callback if successful, we return the error
+ * directly otherwise */
+ end_io_func(page, context, ret);
}
-
- end_io_func(page, context, ret);
#endif
_leave(" = %d", ret);
_
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-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
