Author: arybchik
Date: Fri Jun 17 09:06:30 2016
New Revision: 301988
URL: https://svnweb.freebsd.org/changeset/base/301988

Log:
  MFC r301604
  
  sfxge(4): cleanup: add missing probes to ef10_nvram_segment_write_tlv
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/ef10_nvram.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/ef10_nvram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_nvram.c Fri Jun 17 09:05:26 2016        
(r301987)
+++ stable/10/sys/dev/sfxge/common/ef10_nvram.c Fri Jun 17 09:06:30 2016        
(r301988)
@@ -1658,7 +1658,7 @@ ef10_nvram_partn_write_tlv(
  * Read a segment from nvram at the given offset into a buffer (segment_data)
  * and optionally write a new tag to it.
  */
-       static  __checkReturn   efx_rc_t
+static __checkReturn           efx_rc_t
 ef10_nvram_segment_write_tlv(
        __in                    efx_nic_t *enp,
        __in                    uint32_t partn,
@@ -1684,20 +1684,25 @@ ef10_nvram_segment_write_tlv(
         */
        status = ef10_nvram_read_tlv_segment(enp, partn, *partn_offsetp,
            *seg_datap, *src_remain_lenp);
-       if (status != 0)
-               return (EINVAL);
+       if (status != 0) {
+               rc = EINVAL;
+               goto fail1;
+       }
 
        status = ef10_nvram_buf_segment_size(*seg_datap,
            *src_remain_lenp, &original_segment_size);
-       if (status != 0)
-               return (EINVAL);
+       if (status != 0) {
+               rc = EINVAL;
+               goto fail2;
+       }
 
        if (write) {
                /* Update the contents of the segment in the buffer */
                if ((rc = ef10_nvram_buf_write_tlv(*seg_datap,
                        *dest_remain_lenp, tag, data, size,
-                       &modified_segment_size)) != 0)
-                       goto fail1;
+                       &modified_segment_size)) != 0) {
+                       goto fail3;
+               }
                *dest_remain_lenp -= modified_segment_size;
                *seg_datap += modified_segment_size;
        } else {
@@ -1714,6 +1719,10 @@ ef10_nvram_segment_write_tlv(
 
        return (0);
 
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to