summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-03 14:23:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-03 14:23:58 -0700
commit610603a520bdeb35bd838835f36cfd6b4a563995 (patch)
tree264ea44f95bfd5282e23d93378831794c6ba015f
parent1248ded656d8afb64be01b2985b7b3e562eac914 (diff)
parent4441f63ab7e581ae460c9f7e06fba8a2be192e81 (diff)
downloadlinux-610603a520bdeb35bd838835f36cfd6b4a563995.tar.bz2
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()
-rw-r--r--MAINTAINERS2
-rw-r--r--fs/fuse/file.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e7fa426434e2..ecbb2f6a3ba0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 719924d6c706..dcad5e210525 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -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)