PERFORCE change 79870 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=79870

Change 79870 by rwatson at rwatson_zoo on 2005/07/09 22:31:42

	Clean up file flag return handling, which has changed as of the
	last integration.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#13 (text+ko) ====

@@ -592,7 +592,7 @@
 		    fp->f_flag & ~FNONBLOCK);
 		if (error) {
 			FILE_UNLOCK(fp);
-			break;
+			goto out;
 		}
 #endif
 		if ((tmp = *(int *)data))
@@ -609,7 +609,7 @@
 		    fp->f_flag & ~FASYNC);
 		if (error) {
 			FILE_UNLOCK(fp);
-			break;
+			goto out;
 		}
 #endif
 		if ((tmp = *(int *)data))
@@ -625,6 +625,7 @@
 	if (error == 0 && (com & IOC_OUT))
 		error = copyout(data, uap->data, (u_int)size);
 
+out:
 	if (memp != NULL)
 		free(memp, M_IOCTLOPS);
 	fdrop(fp, td);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message