diff options
| author | wennmach <wennmach@pkgsrc.org> | 2000-11-06 15:24:58 +0000 |
|---|---|---|
| committer | wennmach <wennmach@pkgsrc.org> | 2000-11-06 15:24:58 +0000 |
| commit | c6729874e753cc57fcdb39d669b54590819ddb3e (patch) | |
| tree | 2a51a21e18407867a07c070780263116da47dd02 /net/arla | |
| parent | f189dd69de9e9f18fe2b31c974a3e6c7b1269d64 (diff) | |
| download | pkgsrc-c6729874e753cc57fcdb39d669b54590819ddb3e.tar.gz | |
Do not core dump if a deadlock can be avoided. Also, improve
modload message.
Diffstat (limited to 'net/arla')
| -rw-r--r-- | net/arla/files/patch-sum | 5 | ||||
| -rw-r--r-- | net/arla/patches/patch-ak | 19 | ||||
| -rw-r--r-- | net/arla/patches/patch-av | 19 |
3 files changed, 36 insertions, 7 deletions
diff --git a/net/arla/files/patch-sum b/net/arla/files/patch-sum index eb7e821a5e8..b489e5ec230 100644 --- a/net/arla/files/patch-sum +++ b/net/arla/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.10 2000/10/18 16:32:58 wennmach Exp $ +$NetBSD: patch-sum,v 1.11 2000/11/06 15:24:58 wennmach Exp $ MD5 (patch-aa) = 670da1a7a15dc7753b767bde7893dac2 MD5 (patch-ab) = ecb9e204c48b6f375f3bb727827c5ab5 @@ -8,8 +8,9 @@ MD5 (patch-ae) = 314d5193f368a26322953f94f498849e MD5 (patch-af) = 981665519686a86a1e6cbaeb5f915836 MD5 (patch-ag) = 75603787951f1d56abbbbdcca0ea92db MD5 (patch-ah) = 8d39dc019cf603ebf3c3dd1792399d59 -MD5 (patch-ak) = 35638f7dc4dd55a5541dd3832afb40fc +MD5 (patch-ak) = 41eec6545d0223045ec7770c4dd891ce MD5 (patch-an) = 255f1e20c203f235ba08c4f033270894 MD5 (patch-as) = 20be7c0d85e10335af47eb2c6c0f0769 MD5 (patch-at) = a818ff1add05b59f341b5ec7ebdae023 MD5 (patch-au) = 8ba64c58699400d1ef61149f75b907a9 +MD5 (patch-av) = b46aea4c95cc96c29443ce1f94cbb4e3 diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak index fb289e00fab..ae311cb0cea 100644 --- a/net/arla/patches/patch-ak +++ b/net/arla/patches/patch-ak @@ -1,17 +1,26 @@ -$NetBSD: patch-ak,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $ +$NetBSD: patch-ak,v 1.2 2000/11/06 15:24:58 wennmach Exp $ Do not print a cryptic message after xfs_mod has been modloaded, say it in clear text. ---- xfs/bsd/xfs_wrap-bsd.c.orig Thu Jun 8 13:28:58 2000 -+++ xfs/bsd/xfs_wrap-bsd.c Thu Jun 8 13:35:12 2000 -@@ -310,8 +310,7 @@ +--- xfs/bsd/xfs_wrap-bsd.c.orig Tue May 9 05:17:00 2000 ++++ xfs/bsd/xfs_wrap-bsd.c Mon Nov 6 16:08:55 2000 +@@ -36,6 +36,8 @@ + * SUCH DAMAGE. + */ + ++#include <arla-version.h> ++ + #include <xfs/xfs_locl.h> + #include <xfs/xfs_message.h> + #include <xfs/xfs_fs.h> +@@ -308,8 +310,7 @@ ret = lkmdispatch(lkmtp, cmd); if(cmd == LKM_E_LOAD) { xfs_dev_major = _module.lkm_offset; - printf ("xfs: cdev: %d, syscall: %d\n", - xfs_dev_major, xfs_syscall_num); -+ printf("xfs_mod driver for arla loaded.\n"); ++ printf("driver for %s loaded.\n", arla_version); } return ret; } diff --git a/net/arla/patches/patch-av b/net/arla/patches/patch-av new file mode 100644 index 00000000000..7869a0e08e4 --- /dev/null +++ b/net/arla/patches/patch-av @@ -0,0 +1,19 @@ +$NetBSD: patch-av,v 1.1 2000/11/06 15:24:58 wennmach Exp $ + +Do not send SIGABRT to arlad if a deadlock could be avoided. This psignal +is cruft left over from debugging. Also, avoid "interesting" error reports, +like: +"xfs_message_rpc: deadlock avoided pid = 8006 != 8006" + +--- xfs/bsd/xfs_dev-common.c.old Wed Sep 13 08:34:10 2000 ++++ xfs/bsd/xfs_dev-common.c Mon Nov 6 15:50:15 2000 +@@ -399,8 +399,7 @@ + + if (chan->proc != NULL && proc->p_pid == chan->proc->p_pid) { + printf("xfs_message_rpc: deadlock avoided" +- "pid = %u != %u\n", proc->p_pid, chan->proc->p_pid); +- psignal (proc, SIGABRT); ++ ", pid = %u == %u\n", proc->p_pid, chan->proc->p_pid); + return EDEADLK; + } + |