Date: Sun, 15 Mar 2015 17:39:39 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280043 - head/sys/dev/ixl Message-ID: <201503151739.t2FHddsr075611@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sun Mar 15 17:39:38 2015 New Revision: 280043 URL: https://svnweb.freebsd.org/changeset/base/280043 Log: Remove redundant sysctl_handle_string() calls, the sbuf auto-drain takes care of that. Reviewed by: erj@ Modified: head/sys/dev/ixl/if_ixl.c Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Sun Mar 15 16:18:03 2015 (r280042) +++ head/sys/dev/ixl/if_ixl.c Sun Mar 15 17:39:38 2015 (r280043) @@ -4994,7 +4994,7 @@ ixl_sysctl_hw_res_alloc(SYSCTL_HANDLER_A u8 num_entries; struct i40e_aqc_switch_resource_alloc_element_resp resp[IXL_SW_RES_SIZE]; - buf = sbuf_new_for_sysctl(NULL, NULL, 0, req); + buf = sbuf_new_for_sysctl(NULL, NULL, 128, req); if (!buf) { device_printf(dev, "Could not allocate sbuf for output.\n"); return (ENOMEM); @@ -5038,13 +5038,7 @@ ixl_sysctl_hw_res_alloc(SYSCTL_HANDLER_A error = sbuf_finish(buf); if (error) { device_printf(dev, "Error finishing sbuf: %d\n", error); - sbuf_delete(buf); - return error; } - - error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req); - if (error) - device_printf(dev, "sysctl error: %d\n", error); sbuf_delete(buf); return error; } @@ -5102,7 +5096,7 @@ ixl_sysctl_switch_config(SYSCTL_HANDLER_ struct i40e_aqc_get_switch_config_resp *sw_config; sw_config = (struct i40e_aqc_get_switch_config_resp *)aq_buf; - buf = sbuf_new_for_sysctl(NULL, NULL, 0, req); + buf = sbuf_new_for_sysctl(NULL, NULL, 128, req); if (!buf) { device_printf(dev, "Could not allocate sbuf for sysctl output.\n"); return (ENOMEM); @@ -5121,6 +5115,7 @@ ixl_sysctl_switch_config(SYSCTL_HANDLER_ nmbuf = sbuf_new_auto(); if (!nmbuf) { device_printf(dev, "Could not allocate sbuf for name output.\n"); + sbuf_delete(buf); return (ENOMEM); } @@ -5155,13 +5150,7 @@ ixl_sysctl_switch_config(SYSCTL_HANDLER_ error = sbuf_finish(buf); if (error) { device_printf(dev, "Error finishing sbuf: %d\n", error); - sbuf_delete(buf); - return error; } - - error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req); - if (error) - device_printf(dev, "sysctl error: %d\n", error); sbuf_delete(buf); return (error);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503151739.t2FHddsr075611>