Re: [PATCH 4/4] tracing/uprobes: Fix the usage of uprobe_buffer_enable() in probe_event_enable()

[Steven Rostedt]

On Mon, 30 Jun 2014 22:34:09 +0530
Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx> wrote:


> Acked-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
> (one nit .. )
> 
> > +	ret = uprobe_buffer_enable();
> > +	if (ret)
> > +		goto err_flags;
> > +
> >  	tu->consumer.filter = filter;
> >  	ret = uprobe_register(tu->inode, tu->offset, &tu->consumer);
> > -	if (ret) {
> > -		if (file) {
> > -			list_del(&link->list);
> > -			kfree(link);
> > -			tu->tp.flags &= ~TP_FLAG_TRACE;
> > -		} else
> > -			tu->tp.flags &= ~TP_FLAG_PROFILE;
> > -	}
> > +	if (ret)
> > +		goto err_buffer;
> > 
> > +	return 0;
> > +
> > + err_buffer:
> > +	uprobe_buffer_disable();
> > +
> 
> How about avoiding err_buffer label?
> +	if (!ret)
> +		return 0;
> 
> +	uprobe_buffer_disable();
> +
> 

Oleg, you OK with this update?

I can kill my tests and restart with this update. Or you can resend this
patch. Or we can just push it as is, and have this be a patch that
get's queued as a cleanup for 3.17?

-- Steve

> 
> > + err_flags:
> > +	if (file) {
> > +		list_del(&link->list);
> > 
> > -- 
> > 1.5.5.1
> > 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/