diff options
| author | Paul Lawrence <paullawrence@google.com> | 2019-08-02 16:57:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-02 16:57:52 -0700 |
| commit | ed57295200c86eeafde20a890ddb18956b89f6d1 (patch) | |
| tree | 05b24799434017582e3bba41a01d95884a09bcf2 /lib | |
| parent | f1aef731a708eea5f6e3daf04cb2b9e732326f1e (diff) | |
| parent | 3d406b8575766698bae4908c2cadc3034eb9200c (diff) | |
| download | libfuse-ed57295200c86eeafde20a890ddb18956b89f6d1.tar.gz | |
Merge remote-tracking branch 'origin/upstream-master' am: 9b55afda07 am: ae757e65a9 am: 7eff99c4b7 am: 26f560b643
am: 3d406b8575
Change-Id: I49119cf3733b0495ced4b8bdb5148a8f3c61e0dd
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse_lowlevel.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 3684b8b..b9f128f 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -611,6 +611,35 @@ static int read_back(int fd, char *buf, size_t len) return 0; } +static int grow_pipe_to_max(int pipefd) +{ + int max; + int res; + int maxfd; + char buf[32]; + + maxfd = open("/proc/sys/fs/pipe-max-size", O_RDONLY); + if (maxfd < 0) + return -errno; + + res = read(maxfd, buf, sizeof(buf) - 1); + if (res < 0) { + int saved_errno; + + saved_errno = errno; + close(maxfd); + return -saved_errno; + } + close(maxfd); + buf[res] = '\0'; + + max = atoi(buf); + res = fcntl(pipefd, F_SETPIPE_SZ, max); + if (res < 0) + return -errno; + return max; +} + static int fuse_send_data_iov(struct fuse_session *se, struct fuse_chan *ch, struct iovec *iov, int iov_count, struct fuse_bufvec *buf, unsigned int flags) @@ -666,6 +695,9 @@ static int fuse_send_data_iov(struct fuse_session *se, struct fuse_chan *ch, if (llp->can_grow) { res = fcntl(llp->pipe[0], F_SETPIPE_SZ, pipesize); if (res == -1) { + res = grow_pipe_to_max(llp->pipe[0]); + if (res > 0) + llp->size = res; llp->can_grow = 0; goto fallback; } @@ -2694,6 +2726,9 @@ int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf, res = fcntl(llp->pipe[0], F_SETPIPE_SZ, bufsize); if (res == -1) { llp->can_grow = 0; + res = grow_pipe_to_max(llp->pipe[0]); + if (res > 0) + llp->size = res; goto fallback; } llp->size = res; |