From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754338AbcCBOjH (ORCPT ); Wed, 2 Mar 2016 09:39:07 -0500 Received: from smtprelay0145.hostedemail.com ([216.40.44.145]:40164 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752007AbcCBOjG (ORCPT ); Wed, 2 Mar 2016 09:39:06 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1540:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3866:5007:6261:7875:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12438:12517:12519:12740:13069:13138:13231:13255:13311:13357:13439:14659:21080:21088:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:4,LUA_SUMMARY:none X-HE-Tag: fruit27_4eafc3f3bd148 X-Filterd-Recvd-Size: 2033 Date: Wed, 2 Mar 2016 09:38:59 -0500 From: Steven Rostedt To: Tom Zanussi Cc: masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org, mathieu.desnoyers@efficios.com, peterz@infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v15 03/23] tracing: Add hist trigger support for multiple values ('vals=' param) Message-ID: <20160302093859.0565709d@gandalf.local.home> In-Reply-To: <6535574de7ff2478a1784343648d147637ed0a75.1456501855.git.tom.zanussi@linux.intel.com> References: <6535574de7ff2478a1784343648d147637ed0a75.1456501855.git.tom.zanussi@linux.intel.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 26 Feb 2016 10:01:06 -0600 Tom Zanussi wrote: > +static int create_val_field(struct hist_trigger_data *hist_data, > + unsigned int val_idx, > + struct trace_event_file *file, > + char *field_str) > +{ > + struct ftrace_event_field *field = NULL; > + unsigned long flags = 0; > + int ret = 0; > + > + if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX)) > + return -EINVAL; > + field = trace_find_event_field(file->event_call, field_str); > + if (!field) { > + ret = -EINVAL; > + goto out; > + } > + > + hist_data->fields[val_idx] = create_hist_field(field, flags); > + if (!hist_data->fields[val_idx]) { > + ret = -ENOMEM; > + goto out; > + } > + > + if (WARN_ON(++hist_data->n_vals > TRACING_MAP_VALS_MAX)) > + ret = -EINVAL; Again, move the increment out of the WARN_ON(). > + out: > + return ret; > +} > + -- Steve