From 93daeb5f2b527524aae030abb651b830482b9ee0 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 12 Feb 2009 10:59:01 -0800 Subject: [PATCH] Apply upstream STABLE14-osi-probe-check-result-cope-with-enoent-20090115 --- debian/changelog | 2 ++ src/afs/LINUX/osi_probe.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1fc5db78..170e4db48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low truncation. - STABLE14-linux-i-size-20090112: further fix for truncation race. - STABLE14-linux-truncate-cleanup-20090113: further truncation fix. + - STABLE14-osi-probe-check-result-cope-with-enoent-20090115: fix for + syscall probing. * Make dynroot the default for new installations. It works much better with systems that don't bring up their network until late in the boot process, such as wireless laptops. (LP: #249240, #318605) diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c index f661e9ea3..91b95f6fe 100644 --- a/src/afs/LINUX/osi_probe.c +++ b/src/afs/LINUX/osi_probe.c @@ -1210,14 +1210,14 @@ static void *try_harder(probectl *P, PROBETYPE *ptr, unsigned long datalen) if (probe_debug & 0x0001) { \ printk("<7>osi_probe: %s = 0x%016lx %s\n", P->symbol, (unsigned long)(x), (m)); \ } \ - if ((x)) { \ + if ((x) && ((int)(x)) != -ENOENT) { \ *method = (m); \ final_answer = (void *)(x); \ } \ } while (0) #else #define check_result(x,m) do { \ - if ((x)) { \ + if ((x) && ((int)(x)) != -ENOENT) { \ *method = (m); \ return (void *)(x); \ } \ -- 2.39.5