Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a18ab2f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 864f83a1 e62d6e24

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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/

fs/cachefiles/rdwr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);