Skip to content

Commit a18ab2f

Browse files
committed
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: [email protected] is moderated for non-subscribers FS-Cache: Add missing initialization of ret in cachefiles_write_page()
2 parents 864f83a + e62d6e2 commit a18ab2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,7 +2546,7 @@ F: arch/c6x/
25462546

25472547
CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
25482548
M: David Howells <[email protected]>
2549-
2549+
L: [email protected] (moderated for non-subscribers)
25502550
S: Supported
25512551
F: Documentation/filesystems/caching/cachefiles.txt
25522552
F: fs/cachefiles/
@@ -4559,7 +4559,7 @@ F: include/linux/frontswap.h
45594559

45604560
FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
45614561
M: David Howells <[email protected]>
4562-
4562+
L: [email protected] (moderated for non-subscribers)
45634563
S: Supported
45644564
F: Documentation/filesystems/caching/
45654565
F: fs/fscache/

fs/cachefiles/rdwr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
879879
loff_t pos, eof;
880880
size_t len;
881881
void *data;
882-
int ret;
882+
int ret = -ENOBUFS;
883883

884884
ASSERT(op != NULL);
885885
ASSERT(page != NULL);

0 commit comments

Comments
 (0)