From 54525af8295ce52530d8982ee830cf85d804ef99 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 20 Jan 2015 18:08:16 +0000
Subject: [PATCH] MAXFRAG was always placed incorrectly in <sys/param.h>  It is
 primarily used in disklabel type tools, newfs, fsck, when related to ufs or
 ufs-derived filesystems, but also in a struct. Those things always include
 <ufs/ffs/fs.h>.  Move it there ok guenther, tested in ports by sthen

---
 sys/sys/param.h  | 3 +--
 sys/ufs/ffs/fs.h | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 45a0620fc4e..fe28564658d 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.112 2015/01/20 18:03:17 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.113 2015/01/20 18:08:16 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -153,7 +153,6 @@
 #define MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
 #endif /* _KERNEL */
 #define	MAXBSIZE	(64 * 1024)
-#define MAXFRAG 	8
 
 #define	_DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
 #define	DEV_BSIZE	(1 << _DEV_BSHIFT)
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 98aa23006d3..43c5c8a5e74 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fs.h,v 1.40 2014/05/29 12:02:50 krw Exp $	*/
+/*	$OpenBSD: fs.h,v 1.41 2015/01/20 18:08:16 deraadt Exp $	*/
 /*	$NetBSD: fs.h,v 1.6 1995/04/12 21:21:02 mycroft Exp $	*/
 
 /*
@@ -88,6 +88,8 @@
  * to determine block availability, aligned fragments are examined.
  */
 
+#define MAXFRAG 	8
+
 /*
  * MINBSIZE is the smallest allowable block size.
  * In order to insure that it is possible to create files of size
-- 
2.20.1