UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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()
This commit is contained in:
Linus Torvalds 2015-11-17 10:11:08 -08:00
parent 864f83a1f6 e62d6e244f
commit a18ab2f6cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -2546,7 +2546,7 @@ F: arch/c6x/
CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com>
L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers)
S: Supported S: Supported
F: Documentation/filesystems/caching/cachefiles.txt F: Documentation/filesystems/caching/cachefiles.txt
F: fs/cachefiles/ F: fs/cachefiles/
@ -4559,7 +4559,7 @@ F: include/linux/frontswap.h
FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com>
L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers)
S: Supported S: Supported
F: Documentation/filesystems/caching/ F: Documentation/filesystems/caching/
F: fs/fscache/ F: fs/fscache/

2
fs/cachefiles/rdwr.c
View File

@ -879,7 +879,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
loff_t pos, eof; loff_t pos, eof;
size_t len; size_t len;
void *data; void *data;
int ret; int ret = -ENOBUFS;
ASSERT(op != NULL); ASSERT(op != NULL);
ASSERT(page != NULL); ASSERT(page != NULL);