From owner-svn-src-stable@FreeBSD.ORG  Mon Feb 25 08:14:08 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 9F7BDEDA;
 Mon, 25 Feb 2013 08:14:08 +0000 (UTC)
 (envelope-from delphij@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 90B95377;
 Mon, 25 Feb 2013 08:14:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1P8E8jd088812;
 Mon, 25 Feb 2013 08:14:08 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1P8E8T1088811;
 Mon, 25 Feb 2013 08:14:08 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201302250814.r1P8E8T1088811@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 25 Feb 2013 08:14:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247254 - in stable: 8/sbin/recoverdisk 9/sbin/recoverdisk
X-SVN-Group: stable-8
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: Mon, 25 Feb 2013 08:14:08 -0000

Author: delphij
Date: Mon Feb 25 08:14:07 2013
New Revision: 247254
URL: http://svnweb.freebsd.org/changeset/base/247254

Log:
  MFC r246329:
  
  Use stripesize as smallest block size if it's available.

Modified:
  stable/8/sbin/recoverdisk/recoverdisk.c
Directory Properties:
  stable/8/sbin/recoverdisk/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sbin/recoverdisk/recoverdisk.c
Directory Properties:
  stable/9/sbin/recoverdisk/   (props changed)

Modified: stable/8/sbin/recoverdisk/recoverdisk.c
==============================================================================
--- stable/8/sbin/recoverdisk/recoverdisk.c	Mon Feb 25 08:08:13 2013	(r247253)
+++ stable/8/sbin/recoverdisk/recoverdisk.c	Mon Feb 25 08:14:07 2013	(r247254)
@@ -156,6 +156,7 @@ main(int argc, char * const argv[])
 	int error, flags, state;
 	u_char *buf;
 	u_int sectorsize;
+	u_int stripesize;
 	time_t t1, t2;
 	struct stat sb;
 	u_int n, snapshot = 60;
@@ -202,6 +203,10 @@ main(int argc, char * const argv[])
 		if (error < 0)
 			err(1, "DIOCGSECTORSIZE failed");
 
+		error = ioctl(fdr, DIOCGSTRIPESIZE, &stripesize);
+		if (error == 0 && stripesize > sectorsize)
+			sectorsize = stripesize;
+
 		minsize = sectorsize;
 		bigsize = (bigsize / sectorsize) * sectorsize;