diff options
| author | NeilBrown <neilb@suse.com> | 2016-11-15 12:03:24 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-11-15 16:47:03 -0500 |
| commit | 394e388e1e62d88f2771a3a65ed34c63c1e481bf (patch) | |
| tree | 5852c9431b8934d1966cdb44e8468fac3cf5e49c /utils | |
| parent | 8f3d12ce1d156b8809dc936d9e452e14e2788b3e (diff) | |
| download | nfs-utils-394e388e1e62d88f2771a3a65ed34c63c1e481bf.tar.gz nfs-utils-394e388e1e62d88f2771a3a65ed34c63c1e481bf.tar.xz nfs-utils-394e388e1e62d88f2771a3a65ed34c63c1e481bf.zip | |
Remove all use of /var/lib/nfs/xtab
/var/lib/nfs/xtab is only used to find out what has been exported to
the kernel. This is more reliably done by reading
/proc/fs/nfs{,d}/export and nfs-utils uses that file if is available.
So xtab is only need if you have an incredibly ancient kernel which
doesn't have /proc/fs/nfs/export (and so which only supports NFSv2) or
if /proc is not mounted.
Neither of these are credible contexts to run a modern nfs-utils,
so stop creating or reading the xtab file.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/exportfs/exportfs.c | 4 | ||||
| -rw-r--r-- | utils/mountd/auth.c | 1 | ||||
| -rw-r--r-- | utils/mountd/mountd.c | 11 |
3 files changed, 3 insertions, 13 deletions
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 5136810..98368a5 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -219,8 +219,6 @@ main(int argc, char **argv) xtab_export_write(); if (new_cache) cache_flush(force_flush); - if (!new_cache) - xtab_mount_write(); return export_errno; } @@ -238,7 +236,7 @@ exports_update_one(nfs_export *exp, int verbose) exp->m_export.e_path, exp->m_export.e_mountpoint); exp->m_mayexport = 0; } - if (exp->m_mayexport && ((exp->m_exported<1) || exp->m_changed)) { + if (exp->m_mayexport && exp->m_changed) { if (verbose) printf("%sexporting %s:%s to kernel\n", exp->m_exported ?"re":"", diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c index 0881d9a..b612d88 100644 --- a/utils/mountd/auth.c +++ b/utils/mountd/auth.c @@ -46,7 +46,6 @@ void auth_init(void) { auth_reload(); - xtab_mount_write(); } /* diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index 7a51b09..981abd4 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -107,7 +107,6 @@ unregister_services (void) static void cleanup_lockfiles (void) { - unlink(_PATH_XTABLCK); unlink(_PATH_ETABLCK); unlink(_PATH_RMTABLCK); } @@ -289,7 +288,7 @@ mount_umntall_1_svc(struct svc_req *rqstp, void *UNUSED(argp), xlog(D_CALL, "Received UMNTALL request from %s", host_ntop(sap, buf, sizeof(buf))); - /* Reload /etc/xtab if necessary */ + /* Reload /etc/exports if necessary */ auth_reload(); mountlist_del_all(nfs_getrpccaller(rqstp->rq_xprt)); @@ -350,7 +349,7 @@ mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res) if (*p == '\0') p = "/"; - /* Reload /etc/xtab if necessary */ + /* Reload /etc/exports if necessary */ auth_reload(); /* Resolve symlinks */ @@ -531,12 +530,6 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, nfs_export **expret, } else { int did_export = 0; retry: - if (exp->m_exported<1) { - export_export(exp); - did_export = 1; - } - if (!exp->m_xtabent) - xtab_append(exp); if (v3) fh = getfh_size((struct sockaddr_in *)sap, p, 64); |