@@ -689,6 +689,7 @@ static void nfsd_fh(int f)
int i;
char buf[RPC_CHAN_BUF_SIZE], *bp;
int blen;
+ int short_timeout = 0;
blen = read(f, buf, sizeof(buf));
if (blen <= 0 || buf[blen-1] != '\n') return;
@@ -787,13 +788,12 @@ static void nfsd_fh(int f)
!is_mountpoint(found->e_mountpoint[0]?
found->e_mountpoint:
found->e_path)) {
- /* Cannot export this yet
- * should log a warning, but need to rate limit
- xlog(L_WARNING, "%s not exported as %d not a mountpoint",
- found->e_path, found->e_mountpoint);
+ /* Cannot export this, as it isn't mounted.
+ * Set a short timeout so we might try again
+ * if the filesystem gets mounted.
*/
- /* FIXME we need to make sure we re-visit this later */
- goto out;
+ found = 0;
+ short_timeout = 1;
}
if (found)
@@ -812,7 +812,10 @@ static void nfsd_fh(int f)
* timeout. Maybe this should be configurable on the command
* line.
*/
- qword_addint(&bp, &blen, 0x7fffffff);
+ if (short_timeout)
+ qword_addint(&bp, &blen, DEFAULT_TTL);
+ else
+ qword_addint(&bp, &blen, 0x7fffffff);
if (found)
qword_add(&bp, &blen, found_path);
qword_addeol(&bp, &blen);
If a filehandle arrives for an export with the "mountpoint" option, but which isn't mounted, then we should return ESTALE rather than delaying in the hope the filesystem might get mounted. It is safest to assume that if a filesystem didn't get mounted, then there is a serious problem, and waiting isn't likely to fix it. Signed-off-by: NeilBrown <neilb@suse.com> --- utils/mountd/cache.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html