From owner-svn-src-all@FreeBSD.ORG  Fri May 18 10:01:31 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C65AF106566B;
	Fri, 18 May 2012 10:01:31 +0000 (UTC)
	(envelope-from gleb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B19808FC24;
	Fri, 18 May 2012 10:01:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4IA1Vet044376;
	Fri, 18 May 2012 10:01:31 GMT (envelope-from gleb@svn.freebsd.org)
Received: (from gleb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4IA1VED044374;
	Fri, 18 May 2012 10:01:31 GMT (envelope-from gleb@svn.freebsd.org)
Message-Id: <201205181001.q4IA1VED044374@svn.freebsd.org>
From: Gleb Kurtsou <gleb@FreeBSD.org>
Date: Fri, 18 May 2012 10:01:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235601 - head/include/protocols
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 May 2012 10:01:31 -0000

Author: gleb
Date: Fri May 18 10:01:31 2012
New Revision: 235601
URL: http://svn.freebsd.org/changeset/base/235601

Log:
  Don't use ino_t in dumprestore protocol definition.
  
  Since ino_t size is about to change to 64-bits, replace ino_t used in
  dump protocol definition with 32-bit dump_ino_t to preserve backward
  compatibility.  At some point, it may be necessary to use spare fields
  in struct in order to fully support 64-bit inode numbers.
  
  Sponsored by:	Google Summer of Code 2011

Modified:
  head/include/protocols/dumprestore.h

Modified: head/include/protocols/dumprestore.h
==============================================================================
--- head/include/protocols/dumprestore.h	Fri May 18 09:22:21 2012	(r235600)
+++ head/include/protocols/dumprestore.h	Fri May 18 10:01:31 2012	(r235601)
@@ -65,6 +65,15 @@
 #endif
 #define CHECKSUM	(int)84446
 
+/*
+ * Since ino_t size is changing to 64-bits, yet we desire this structure to
+ * remain compatible with exiting dump formats, we do NOT use ino_t here,
+ * but rather define a 32-bit type in its place.  At some point, it may be
+ * necessary to use some of the c_spare[] in order to fully support 64-bit
+ * inode numbers.
+ */
+typedef uint32_t dump_ino_t;
+
 union u_spcl {
 	char dummy[TP_BSIZE];
 	struct	s_spcl {
@@ -73,7 +82,7 @@ union u_spcl {
 		int32_t	c_old_ddate;	    /* date of previous dump */
 		int32_t	c_volume;	    /* dump volume number */
 		int32_t	c_old_tapea;	    /* logical block of this record */
-		ino_t	c_inumber;	    /* number of inode */
+		dump_ino_t c_inumber;	    /* number of inode */
 		int32_t	c_magic;	    /* magic number (see above) */
 		int32_t	c_checksum;	    /* record checksum */
 		/*