From owner-svn-src-head@FreeBSD.ORG  Sat Aug  2 05:05:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BFEEB9B3;
 Sat,  2 Aug 2014 05:05:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE8AE2971;
 Sat,  2 Aug 2014 05:05:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7255G2k035463;
 Sat, 2 Aug 2014 05:05:16 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7255GAt035462;
 Sat, 2 Aug 2014 05:05:16 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201408020505.s7255GAt035462@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 2 Aug 2014 05:05:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269422 - head/sys/fs/nandfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Aug 2014 05:05:16 -0000

Author: imp
Date: Sat Aug  2 05:05:16 2014
New Revision: 269422
URL: http://svnweb.freebsd.org/changeset/base/269422

Log:
  Set the erase block size properly in the case the underlying media
  doesn't advertise an erase block size.
  
  Submitted by: bjg@
  Pointy hat to: imp@

Modified:
  head/sys/fs/nandfs/nandfs_vfsops.c

Modified: head/sys/fs/nandfs/nandfs_vfsops.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_vfsops.c	Sat Aug  2 05:05:10 2014	(r269421)
+++ head/sys/fs/nandfs/nandfs_vfsops.c	Sat Aug  2 05:05:16 2014	(r269422)
@@ -912,7 +912,7 @@ nandfs_mount_device(struct vnode *devvp,
 			/*
 			 * We conclude that this is not NAND storage
 			 */
-			nandfsdev->nd_erasesize = NANDFS_DEF_ERASESIZE;
+			erasesize = NANDFS_DEF_ERASESIZE;
 		} else {
 			DROP_GIANT();
 			g_topology_lock();
@@ -924,7 +924,6 @@ nandfs_mount_device(struct vnode *devvp,
 			return (error);
 		}
 	}
-
 	nandfsdev->nd_erasesize = erasesize;
 
 	DPRINTF(VOLUMES, ("%s: erasesize %x\n", __func__,