Module Name: src
Committed By: christos
Date: Tue May 21 18:09:31 UTC 2019
Modified Files:
src/sys/kern: sys_descrip.c
Log Message:
provide more info about who is getting ERESTART.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/sys_descrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.32 src/sys/kern/sys_descrip.c:1.33
--- src/sys/kern/sys_descrip.c:1.32 Sat Feb 2 22:19:28 2019
+++ src/sys/kern/sys_descrip.c Tue May 21 14:09:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.32 2019/02/03 03:19:28 mrg Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.33 2019/05/21 18:09:31 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.32 2019/02/03 03:19:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.33 2019/05/21 18:09:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -481,16 +481,17 @@ sys_close(struct lwp *l, const struct sy
syscallarg(int) fd;
} */
int error;
+ int fd = SCARG(uap, fd);
- if (fd_getfile(SCARG(uap, fd)) == NULL) {
+ if (fd_getfile(fd) == NULL) {
return EBADF;
}
- error = fd_close(SCARG(uap, fd));
+ error = fd_close(fd);
if (error == ERESTART) {
#ifdef DIAGNOSTIC
- printf("pid %d: close returned ERESTART\n",
- (int)l->l_proc->p_pid);
+ printf("%s[%d]: close(%d) returned ERESTART\n",
+ l->l_proc->p_comm, (int)l->l_proc->p_pid, fd);
#endif
error = EINTR;
}
