From owner-svn-src-head@FreeBSD.ORG  Thu Apr 24 20:53:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D4919F00;
 Thu, 24 Apr 2014 20:53:09 +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 BD3AA1D2F;
 Thu, 24 Apr 2014 20:53:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OKr9RI033677;
 Thu, 24 Apr 2014 20:53:09 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OKr9Z4033676;
 Thu, 24 Apr 2014 20:53:09 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201404242053.s3OKr9Z4033676@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 24 Apr 2014 20:53:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264889 - head/sbin/newfs_msdos
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.17
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: Thu, 24 Apr 2014 20:53:09 -0000

Author: emaste
Date: Thu Apr 24 20:53:09 2014
New Revision: 264889
URL: http://svnweb.freebsd.org/changeset/base/264889

Log:
  Correct min/max cluster counts for FAT12/16/32
  
  FAT12      1..4084
  FAT16   4085..65524
  FAT32  65525..
  
  This is required for interoperability with other FAT implementations,
  and in particular UEFI.
  
  Obtained from:      NetBSD
  Sponsored by:       The FreeBSD Foundation

Modified:
  head/sbin/newfs_msdos/newfs_msdos.c

Modified: head/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- head/sbin/newfs_msdos/newfs_msdos.c	Thu Apr 24 20:47:58 2014	(r264888)
+++ head/sbin/newfs_msdos/newfs_msdos.c	Thu Apr 24 20:53:09 2014	(r264889)
@@ -64,11 +64,11 @@ static const char rcsid[] =
 #define DEFRDE	  512		/* default root directory entries */
 #define RESFTE	  2		/* reserved FAT entries */
 #define MINCLS12  1U		/* minimum FAT12 clusters */
-#define MINCLS16  0x1000U	/* minimum FAT16 clusters */
-#define MINCLS32  2U		/* minimum FAT32 clusters */
-#define MAXCLS12  0xfedU	/* maximum FAT12 clusters */
-#define MAXCLS16  0xfff5U	/* maximum FAT16 clusters */
-#define MAXCLS32  0xffffff5U	/* maximum FAT32 clusters */
+#define MINCLS16  0xff5U	/* minimum FAT16 clusters */
+#define MINCLS32  0xfff5U	/* minimum FAT32 clusters */
+#define MAXCLS12  0xff4U	/* maximum FAT12 clusters */
+#define MAXCLS16  0xfff4U	/* maximum FAT16 clusters */
+#define MAXCLS32  0xffffff4U	/* maximum FAT32 clusters */
 
 #define mincls(fat)  ((fat) == 12 ? MINCLS12 :	\
 		      (fat) == 16 ? MINCLS16 :	\