Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 7 Jun 2017 07:36:59 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r319645 - user/pho/stress2/misc
Message-ID:  <201706070736.v577axfw059198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pho
Date: Wed Jun  7 07:36:59 2017
New Revision: 319645
URL: https://svnweb.freebsd.org/changeset/base/319645

Log:
  Load pty.ko if needed. Style fixes while here.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/fpclone.sh

Modified: user/pho/stress2/misc/fpclone.sh
==============================================================================
--- user/pho/stress2/misc/fpclone.sh	Wed Jun  7 07:32:25 2017	(r319644)
+++ user/pho/stress2/misc/fpclone.sh	Wed Jun  7 07:36:59 2017	(r319645)
@@ -33,6 +33,8 @@
 # Test of patch for Giant trick in cdevsw
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+[ -d /usr/src/sys ] || exit 0
+kldstat -v | grep -q pty || { kldload pty || exit 0; }
 
 . ../default.cfg
 
@@ -58,7 +60,7 @@ for i in `jot 10`; do
 done
 
 export runRUNTIME=2m
-cd ..; ./run.sh pty.cfg 
+cd ..; ./run.sh pty.cfg
 
 for i in `jot 10`; do
 	wait
@@ -87,7 +89,7 @@ static d_read_t		fpclone_read;
 static struct cdevsw fpclone_cdevsw = {
 	.d_open =	fpclone_open,
 	.d_close =	fpclone_close,
-	.d_read =	fpclone_read,	
+	.d_read =	fpclone_read,
 	.d_name =	"fpclone",
 	.d_version =	D_VERSION,
 	.d_flags =	D_TRACKCLOSE
@@ -110,7 +112,7 @@ fpclone_cdevpriv_dtr(void *data)
 }
 
 static int
-fpclone_open(struct cdev *dev, int oflags, int devtype, d_thread_t *td)
+fpclone_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 {
 	struct fpclone_sc *sc;
 	int error;
@@ -124,7 +126,7 @@ fpclone_open(struct cdev *dev, int oflags, int devtype
 }
 
 static int
-fpclone_close(struct cdev *dev, int fflag, int devtype, d_thread_t *td)
+fpclone_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
 
 	devfs_clear_cdevpriv();
@@ -138,7 +140,7 @@ fpclone_read(struct cdev *dev, struct uio *uio, int io
 {
 	struct fpclone_sc *sc;
 	int rv, amnt, svpos, error;
-	
+
 	error = devfs_get_cdevpriv((void **)&sc);
 	if (error)
 		return (error);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706070736.v577axfw059198>