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

Commit 610603a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fuse fixes from Miklos Szeredi:
 "Fix a regression and update the MAINTAINERS entry for fuse"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: update mailing list in MAINTAINERS
  fuse: Fix return value from fuse_get_user_pages()
parents 1248ded6 4441f63a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4744,7 +4744,7 @@ F: drivers/platform/x86/fujitsu-tablet.c 


FUSE: FILESYSTEM IN USERSPACE

M:	Miklos Szeredi <miklos@szeredi.hu>

L:	fuse-devel@lists.sourceforge.net

L:	linux-fsdevel@vger.kernel.org

W:	http://fuse.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git

S:	Maintained

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ static int fuse_get_user_pages(struct fuse_req *req, struct iov_iter *ii, 


	*nbytesp = nbytes;



	return ret;

	return ret < 0 ? ret : 0;

}



static inline int fuse_iter_npages(const struct iov_iter *ii_p)