svn commit: r284670 - head/sys/dev/xen/blkfront

[Colin Percival]

Author: cperciva
Date: Sun Jun 21 06:52:03 2015
New Revision: 284670
URL: https://svnweb.freebsd.org/changeset/base/284670

Log:
  Garbage collect comments and a macro which related to the pre-r284296
  support for a "segment block" extension in FreeBSD's Xen blkfront/blkback
  drivers.
  
  This commit should not result in any functional changes.

Modified:
  head/sys/dev/xen/blkfront/block.h

Modified: head/sys/dev/xen/blkfront/block.h
==============================================================================
--- head/sys/dev/xen/blkfront/block.h	Sun Jun 21 06:49:44 2015	(r284669)
+++ head/sys/dev/xen/blkfront/block.h	Sun Jun 21 06:52:03 2015	(r284670)
@@ -68,9 +68,8 @@
 #define XBD_MAX_RING_PAGES		32
 
 /**
- * The maximum number of outstanding requests blocks (request headers plus
- * additional segment blocks) we will allow in a negotiated block-front/back
- * communication channel.
+ * The maximum number of outstanding requests we will allow in a negotiated
+ * block-front/back communication channel.
  */
 #define XBD_MAX_REQUESTS						\
 	__CONST_RING_SIZE(blkif, PAGE_SIZE * XBD_MAX_RING_PAGES)
@@ -82,15 +81,6 @@
 #define	XBD_MAX_REQUEST_SIZE						\
 	MIN(MAXPHYS, XBD_SEGS_TO_SIZE(BLKIF_MAX_SEGMENTS_PER_REQUEST))
 
-/**
- * The maximum number of segments (within a request header and accompanying
- * segment blocks) per request we will allow in a negotiated block-front/back
- * communication channel.
- */
-#define	XBD_MAX_SEGMENTS_PER_REQUEST					\
-	(MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST,				\
-	     XBD_SIZE_TO_SEGS(XBD_MAX_REQUEST_SIZE)))
-
 typedef enum {
 	XBDCF_Q_MASK		= 0xFF,
 	/* This command has contributed to xbd_qfrozen_cnt. */