On Thu, Jan 30, 2025 at 09:32:52AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the fuse tree got a conflict in:
>
> fs/fuse/sysctl.c
>
> between commit:
>
> 1751f872cc97 ("treewide: const qualify ctl_tables where applicable")
>
> from Linus' tree and commit:
>
> 9afd7336f3ac ("fuse: add default_request_timeout and max_request_timeout sysctls")
>
> from the fuse tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/fuse/sysctl.c
> index 63fb1e5bee30,3d542ef9d889..000000000000
> --- a/fs/fuse/sysctl.c
> +++ b/fs/fuse/sysctl.c
> @@@ -13,7 -13,13 +13,13 @@@ static struct ctl_table_header *fuse_ta
> /* Bound by fuse_init_out max_pages, which is a u16 */
> static unsigned int sysctl_fuse_max_pages_limit = 65535;
>
> + /*
> + * fuse_init_out request timeouts are u16.
> + * This goes up to ~18 hours, which is plenty for a timeout.
> + */
> + static unsigned int sysctl_fuse_req_timeout_limit = 65535;
> +
> -static struct ctl_table fuse_sysctl_table[] = {
> +static const struct ctl_table fuse_sysctl_table[] = {
This LGTM. As long as that array is const, I'm happy :)
Not sure if this makes sense in this context but:
Reviewed-by: Joel Granados <joel.granados@xxxxxxxxxx>
> {
> .procname = "max_pages_limit",
> .data = &fuse_max_pages_limit,
--
Joel Granados
