projects/linux·commit a18ab2f6

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

a18ab2f6 · Linus Torvalds <[email protected]> · 2015-11-17 10:11:08 -08:00

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: [email protected] is moderated for non-subscribers
  FS-Cache: Add missing initialization of ret in cachefiles_write_page()
Commit
a18ab2f6cb79eeccedea61b8c7bf71d24e087d42
Parents
864f83a1 · e62d6e24

Merge commit. Changes below are compared with the first parent: 864f83a1.

Changes

2 files changed · +3 −3

FileStatusAddDelContent
MAINTAINERSmodified+2−2View file
fs/cachefiles/rdwr.cmodified+1−1View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index e9caa4b..78d9cbf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2546,7 +2546,7 @@ F: arch/c6x/
CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
M: David Howells <[email protected]>
-L: [email protected]
+L: [email protected] (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 <[email protected]>
-L: [email protected]
+L: [email protected] (moderated for non-subscribers)
S: Supported
F: Documentation/filesystems/caching/
F: fs/fscache/

fs/cachefiles/rdwr.c

View file
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index 7a6b02f..c0f3da3 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);