mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-11-23 12:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change FUSE_MAX_MAX_PAGES to FUSE_DEFAULT_MAX_PAGES_LIMIT

Browse Source 
A recent upstream patch [1] changed FUSE_MAX_MAX_PAGES to
FUSE_DEFAULT_MAX_PAGES_LIMIT.

Update libfuse to use FUSE_DEFAULT_MAX_PAGES_LIMIT as well
instead of FUSE_MAX_MAX_PAGES.

[1] https://lore.kernel.org/linux-fsdevel/20240923171311.1561917-1-joannelkoong@gmail.com/T/#t
This commit is contained in:
Joanne Koong 2024-09-26 17:33:39 -07:00 committed by Bernd Schubert
parent 78eeae60bb
commit 9069ad9eb6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fuse_i.h
View File

@ -196,7 +196,13 @@ int fuse_session_loop_mt_312(struct fuse_session *se, struct fuse_loop_config *c
int fuse_loop_cfg_verify(struct fuse_loop_config *config); int fuse_loop_cfg_verify(struct fuse_loop_config *config);
#define FUSE_MAX_MAX_PAGES 256 /*
* This can be changed dynamically on recent kernels through the
* /proc/sys/fs/fuse/max_pages_limit interface.
*
* Older kernels will always use the default value.
*/
#define FUSE_DEFAULT_MAX_PAGES_LIMIT 256
#define FUSE_DEFAULT_MAX_PAGES_PER_REQ 32 #define FUSE_DEFAULT_MAX_PAGES_PER_REQ 32
/* room needed in buffer to accommodate header */ /* room needed in buffer to accommodate header */

6
lib/fuse_lowlevel.c
View File

@ -2915,19 +2915,19 @@ static unsigned int get_max_pages(void)
fd = open("/proc/sys/fs/fuse/max_pages_limit", O_RDONLY); fd = open("/proc/sys/fs/fuse/max_pages_limit", O_RDONLY);
if (fd < 0) if (fd < 0)
return FUSE_MAX_MAX_PAGES; return FUSE_DEFAULT_MAX_PAGES_LIMIT;
res = read(fd, buf, sizeof(buf) - 1); res = read(fd, buf, sizeof(buf) - 1);
close(fd); close(fd);
if (res < 0) if (res < 0)
return FUSE_MAX_MAX_PAGES; return FUSE_DEFAULT_MAX_PAGES_LIMIT;
buf[res] = '\0'; buf[res] = '\0';
res = strtol(buf, NULL, 10); res = strtol(buf, NULL, 10);
return res < 0 ? FUSE_MAX_MAX_PAGES : res; return res < 0 ? FUSE_DEFAULT_MAX_PAGES_LIMIT : res;
} }
int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf) int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf)