From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 19 05:02:26 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7D48ED07;
 Wed, 19 Jun 2013 05:02:26 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6FCEE19CB;
 Wed, 19 Jun 2013 05:02:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5J52Q4j066568;
 Wed, 19 Jun 2013 05:02:26 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5J52QmE066567;
 Wed, 19 Jun 2013 05:02:26 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <201306190502.r5J52QmE066567@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Wed, 19 Jun 2013 05:02:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251987 - stable/9/sys/sys
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jun 2013 05:02:26 -0000

Author: scottl
Date: Wed Jun 19 05:02:25 2013
New Revision: 251987
URL: http://svnweb.freebsd.org/changeset/base/251987

Log:
  Poor man's binary compatibility of the struct bio: move the added structure
  members to the end of the structure.
  
  Obtained from:	Netflix

Modified:
  stable/9/sys/sys/bio.h

Modified: stable/9/sys/sys/bio.h
==============================================================================
--- stable/9/sys/sys/bio.h	Wed Jun 19 04:57:47 2013	(r251986)
+++ stable/9/sys/sys/bio.h	Wed Jun 19 05:02:25 2013	(r251987)
@@ -81,9 +81,6 @@ struct bio {
 	off_t	bio_offset;		/* Offset into file. */
 	long	bio_bcount;		/* Valid bytes in buffer. */
 	caddr_t	bio_data;		/* Memory, superblocks, indirect etc. */
-	struct vm_page **bio_ma;	/* Or unmapped. */
-	int	bio_ma_offset;		/* Offset in the first page of bio_ma. */
-	int	bio_ma_n;		/* Number of pages in bio_ma. */
 	int	bio_error;		/* Errno for BIO_ERROR. */
 	long	bio_resid;		/* Remaining I/O in bytes. */
 	void	(*bio_done)(struct bio *);
@@ -116,6 +113,11 @@ struct bio {
 
 	/* XXX: these go away when bio chaining is introduced */
 	daddr_t bio_pblkno;               /* physical block number */
+
+	/* Unmapped i/o.  Placed at the end in 9.x for binary compatibility. */
+	struct vm_page **bio_ma;	/* Physical page array. */
+	int	bio_ma_offset;		/* Offset in first page of bio_ma. */
+	int	bio_ma_n;		/* Number of pages in bio_ma. */
 };
 
 struct uio;