struct exportent *found = NULL;
nfs_export *exp;
int i;
+ int dev_missing = 0;
if (readline(fileno(f), &lbuf, &lbuflen) != 1)
return;
continue;
if (fsidtype == 0) {
struct stat stb;
+ if (exp->m_export.e_mountpoint &&
+ !is_mountpoint(exp->m_export.e_mountpoint[0]?
+ exp->m_export.e_mountpoint:
+ exp->m_export.e_path))
+ dev_missing ++;
if (stat(exp->m_export.e_path, &stb) != 0)
continue;
if (stb.st_ino != inode)
found = &exp->m_export;
else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
{
- xlog(L_WARNING, "%s and %s have name filehandle for %s, using first",
+ xlog(L_WARNING, "%s and %s have same filehandle for %s, using first",
found->e_path, exp->m_export.e_path, dom);
}
}
}
- cache_export_ent(dom, found);
+ if (found &&
+ found->e_mountpoint &&
+ !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);
+ */
+ /* FIXME we need to make sure we re-visit this later */
+ goto out;
+ }
+ if (!found && dev_missing) {
+ /* The missing dev could be what we want, so just be
+ * quite rather than returning stale yet
+ */
+ goto out;
+ }
+
+ if (found)
+ cache_export_ent(dom, found);
qword_print(f, dom);
qword_printint(f, fsidtype);
* } <> /proc/fs/nfs/filehandle
*/
struct nfs_fh_len *
-cache_get_filehandle(nfs_export *exp, int len)
+cache_get_filehandle(nfs_export *exp, int len, char *p)
{
FILE *f = fopen("/proc/fs/nfs/filehandle", "r+");
char buf[200];
return NULL;
qword_print(f, exp->m_client->m_hostname);
- qword_print(f, exp->m_export.e_path);
+ qword_print(f, p);
qword_printint(f, len);
qword_eol(f);