029559f225
Errors from match_fsid() shouldn't be fatal. (bsc#1214540) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=277
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 0f46b6728d0f45393eb0e33a90fcfa2147271275 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Wed, 11 Oct 2023 12:32:25 +1100
|
|
Subject: [PATCH] export: fix handling of error from match_fsid()
|
|
|
|
If match_fsid() returns -1 we shouldn't assume that the path definitely
|
|
doesn't match the fsid, though it might not.
|
|
This is a similar situation to where an export is expected to be a mount
|
|
point, but is found not to be one. So it can be handled the same way,
|
|
by setting 'dev_missing'.
|
|
This will only have an effect is no other path matched the fsid, which
|
|
is what we want.
|
|
|
|
The current code results in nothing being exported and any export point,
|
|
or any mount point beneath a crossmnt export point fail a 'stat'
|
|
request, which is too harsh.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
---
|
|
support/export/cache.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/support/export/cache.c
|
|
+++ b/support/export/cache.c
|
|
@@ -858,7 +858,8 @@ static void nfsd_fh(int f)
|
|
case 0:
|
|
continue;
|
|
case -1:
|
|
- goto out;
|
|
+ dev_missing ++;
|
|
+ continue;
|
|
}
|
|
if (is_ipaddr_client(dom)
|
|
&& !ipaddr_client_matches(exp, ai))
|