Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A fs-cache regression fix, and adding a warning about obnoxiou^W
  moderation of list given in MAINTAINERS"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  MAINTAINERS: linux-cachefs@redhat.com is moderated for non-subscribers
  FS-Cache: Add missing initialization of ret in cachefiles_write_page()

2 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e9caa4b28828..78d9cbf96683 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2546,7 +2546,7 @@ F:	arch/c6x/
 
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:      David Howells <dhowells@redhat.com>
-L:      linux-cachefs@redhat.com
+L:      linux-cachefs@redhat.com (moderated for non-subscribers)
 S:      Supported
 F:      Documentation/filesystems/caching/cachefiles.txt
 F:      fs/cachefiles/
@@ -4559,7 +4559,7 @@ F:	include/linux/frontswap.h
 
 FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
 M:      David Howells <dhowells@redhat.com>
-L:      linux-cachefs@redhat.com
+L:      linux-cachefs@redhat.com (moderated for non-subscribers)
 S:      Supported
 F:      Documentation/filesystems/caching/
 F:      fs/fscache/
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index 7a6b02f72787..c0f3da3926a0 100644
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@ -879,7 +879,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
         loff_t pos, eof;
         size_t len;
         void *data;
-        int ret;
+        int ret = -ENOBUFS;
 
         ASSERT(op != NULL);
         ASSERT(page != NULL);