svn commit: r267494 - in stable/10/sys: conf kern modules/ufs ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Sun Jun 15 05:15:38 2014
New Revision: 267494
URL: http://svnweb.freebsd.org/changeset/base/267494

Log:
  MFC r267226:
  Initialize the pbuf counter for directio using SYSINIT.
  Mark ffs_rawread.c as requiring both ffs and directio options to be
  compiled into the kernel.  Add ffs_rawread.c to the list of ufs.ko
  module' sources.

Modified:
  stable/10/sys/conf/files
  stable/10/sys/kern/vfs_bio.c
  stable/10/sys/modules/ufs/Makefile
  stable/10/sys/ufs/ffs/ffs_rawread.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files
==============================================================================
--- stable/10/sys/conf/files	Sun Jun 15 05:07:01 2014	(r267493)
+++ stable/10/sys/conf/files	Sun Jun 15 05:15:38 2014	(r267494)
@@ -3910,7 +3910,7 @@ ufs/ffs/ffs_subr.c		optional ffs
 ufs/ffs/ffs_tables.c		optional ffs
 ufs/ffs/ffs_vfsops.c		optional ffs
 ufs/ffs/ffs_vnops.c		optional ffs
-ufs/ffs/ffs_rawread.c		optional directio
+ufs/ffs/ffs_rawread.c		optional ffs directio
 ufs/ffs/ffs_suspend.c		optional ffs
 ufs/ufs/ufs_acl.c		optional ffs
 ufs/ufs/ufs_bmap.c		optional ffs

Modified: stable/10/sys/kern/vfs_bio.c
==============================================================================
--- stable/10/sys/kern/vfs_bio.c	Sun Jun 15 05:07:01 2014	(r267493)
+++ stable/10/sys/kern/vfs_bio.c	Sun Jun 15 05:15:38 2014	(r267494)
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 #include "opt_compat.h"
-#include "opt_directio.h"
 #include "opt_swap.h"
 
 static MALLOC_DEFINE(M_BIOBUF, "biobuf", "BIO buffer");
@@ -351,10 +350,6 @@ sysctl_bufspace(SYSCTL_HANDLER_ARGS)
 }
 #endif
 
-#ifdef DIRECTIO
-extern void ffs_rawread_setup(void);
-#endif /* DIRECTIO */
-
 /*
  *	bqlock:
  *
@@ -739,9 +734,6 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon
 	if (nswbuf < NSWBUF_MIN)
 		nswbuf = NSWBUF_MIN;
 #endif
-#ifdef DIRECTIO
-	ffs_rawread_setup();
-#endif
 
 	/*
 	 * Reserve space for the buffer cache buffers

Modified: stable/10/sys/modules/ufs/Makefile
==============================================================================
--- stable/10/sys/modules/ufs/Makefile	Sun Jun 15 05:07:01 2014	(r267493)
+++ stable/10/sys/modules/ufs/Makefile	Sun Jun 15 05:15:38 2014	(r267494)
@@ -6,9 +6,9 @@ KMOD=	ufs
 SRCS=	opt_ddb.h opt_directio.h opt_ffs.h opt_quota.h opt_suiddir.h opt_ufs.h \
 	vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \
 	ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
-	ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \
-	ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c ffs_vfsops.c \
-	ffs_vnops.c
+	ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_rawread.c \
+	ffs_snapshot.c ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c \
+	ffs_vfsops.c ffs_vnops.c
 
 .if !defined(KERNBUILDDIR)
 CFLAGS+= -DSOFTUPDATES -DUFS_DIRHASH

Modified: stable/10/sys/ufs/ffs/ffs_rawread.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_rawread.c	Sun Jun 15 05:07:01 2014	(r267493)
+++ stable/10/sys/ufs/ffs/ffs_rawread.c	Sun Jun 15 05:15:38 2014	(r267494)
@@ -71,8 +71,6 @@ static int ffs_rawread_sync(struct vnode
 
 int ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone);
 
-void ffs_rawread_setup(void);
-
 SYSCTL_DECL(_vfs_ffs);
 
 static int ffsrawbufcnt = 4;
@@ -87,13 +85,13 @@ static int rawreadahead = 1;
 SYSCTL_INT(_vfs_ffs, OID_AUTO, rawreadahead, CTLFLAG_RW, &rawreadahead, 0,
 	   "Flag to enable readahead for long raw reads");
 
-
-void
-ffs_rawread_setup(void)
+static void
+ffs_rawread_setup(void *arg __unused)
 {
+
 	ffsrawbufcnt = (nswbuf > 100 ) ? (nswbuf - (nswbuf >> 4)) : nswbuf - 8;
 }
-
+SYSINIT(ffs_raw, SI_SUB_VM_CONF, SI_ORDER_ANY, ffs_rawread_setup, NULL);
 
 static int
 ffs_rawread_sync(struct vnode *vp)