Author: sephe
Date: Fri Nov 25 08:31:13 2016
New Revision: 309138
URL: https://svnweb.freebsd.org/changeset/base/309138

Log:
  hyperv/vmbus: Always try disconnect/free bufring memory upon channel close
  
  While I'm here, minor wording and style changes.
  
  MFC after:    1 week
  Sponsored by: Microsoft
  Differential Revision:        https://reviews.freebsd.org/D8598

Modified:
  head/sys/dev/hyperv/vmbus/vmbus_chan.c

Modified: head/sys/dev/hyperv/vmbus/vmbus_chan.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_chan.c      Fri Nov 25 07:43:31 2016        
(r309137)
+++ head/sys/dev/hyperv/vmbus/vmbus_chan.c      Fri Nov 25 08:31:13 2016        
(r309138)
@@ -792,7 +792,7 @@ vmbus_chan_close_internal(struct vmbus_c
                vmbus_chan_printf(chan,
                    "can not get msg hypercall for chclose(chan%u)\n",
                    chan->ch_id);
-               return;
+               goto disconnect;
        }
 
        req = vmbus_msghc_dataptr(mh);
@@ -806,11 +806,13 @@ vmbus_chan_close_internal(struct vmbus_c
                vmbus_chan_printf(chan,
                    "chclose(chan%u) msg hypercall exec failed: %d\n",
                    chan->ch_id, error);
-               return;
-       } else if (bootverbose) {
-               vmbus_chan_printf(chan, "close chan%u\n", chan->ch_id);
+               goto disconnect;
        }
 
+       if (bootverbose)
+               vmbus_chan_printf(chan, "chan%u closed\n", chan->ch_id);
+
+disconnect:
        /*
         * Disconnect the TX+RX bufrings from this channel.
         */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to