[PATCH 4/4] mqueue namespace: adapt sysctl

Alexey Dobriyan adobriyan at gmail.com
Tue Feb 24 14:32:45 PST 2009


On Tue, Feb 24, 2009 at 02:16:51PM -0800, Andrew Morton wrote:
> On Tue, 24 Feb 2009 16:02:56 -0600
> "Serge E. Hallyn" <serue at us.ibm.com> wrote:
> 
> > +#ifdef CONFIG_PROC_SYSCTL
> > +static int proc_mq_dointvec(ctl_table *table, int write, struct file *filp,
> > +	void __user *buffer, size_t *lenp, loff_t *ppos)
> > +{
> > +	struct ctl_table mq_table;
> > +	memcpy(&mq_table, table, sizeof(mq_table));
> > +	mq_table.data = get_mq(table);
> > +
> > +	return proc_dointvec(&mq_table, write, filp, buffer, lenp, ppos);
> > +}
> > +
> > +static int proc_mq_dointvec_minmax(ctl_table *table, int write,
> > +	struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos)
> > +{
> > +	struct ctl_table mq_table;
> > +	memcpy(&mq_table, table, sizeof(mq_table));
> > +	mq_table.data = get_mq(table);
> > +
> > +	return proc_dointvec_minmax(&mq_table, write, filp, buffer,
> > +					lenp, ppos);
> > +}
> > +#else
> > +proc_handler *proc_mq_dointvec = NULL;
> > +proc_handler *proc_mq_dointvec_minmax = NULL;
> > +#endif
> 
> looks odd.  Was this
> 
> --- a/ipc/mq_sysctl.c~mqueue-namespace-adapt-sysctl-update-fix
> +++ a/ipc/mq_sysctl.c
> @@ -52,8 +52,8 @@ static int proc_mq_dointvec_minmax(ctl_t
>  					lenp, ppos);
>  }
>  #else
> -proc_handler *proc_mq_dointvec = NULL;
> -proc_handler *proc_mq_dointvec_minmax = NULL;
> +#define proc_mq_dointvec NULL
> +#define proc_mq_dointvec_minmax NULL
>  #endif

I hope, not.

"#define foo NULL" is the least intrusive thing.


More information about the Containers mailing list