svn commit: r333838 - head/sys/kern

[Matt Macy]

Author: mmacy
Date: Sat May 19 04:04:44 2018
New Revision: 333838
URL: https://svnweb.freebsd.org/changeset/base/333838

Log:
  simplify control flow so that gcc knows we never pass save to curthread_pflags_restore
  without initializing

Modified:
  head/sys/kern/subr_uio.c

Modified: head/sys/kern/subr_uio.c
==============================================================================
--- head/sys/kern/subr_uio.c	Sat May 19 04:02:29 2018	(r333837)
+++ head/sys/kern/subr_uio.c	Sat May 19 04:04:44 2018	(r333838)
@@ -212,7 +212,7 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, in
 	size_t cnt;
 	int error, newflags, save;
 
-	error = 0;
+	save = error = 0;
 
 	KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE,
 	    ("uiomove: mode"));
@@ -275,7 +275,7 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, in
 		n -= cnt;
 	}
 out:
-	if (uio->uio_segflg == UIO_USERSPACE) 
+	if (save)
 		curthread_pflags_restore(save);
 	return (error);
 }