diff options
| author | neilbrown <neilbrown> | 2003-03-26 03:05:39 +0000 |
|---|---|---|
| committer | neilbrown <neilbrown> | 2003-03-26 03:05:39 +0000 |
| commit | 16be8c20d6fe1a997d90ecb229aee6a5f092b73d (patch) | |
| tree | 72625879992ba430479dd80550918facef1dfb1c /utils/exportfs/exportfs.c | |
| parent | cec295bf37b784ed6ae5674ce34b9c75d89ea0a1 (diff) | |
| download | nfs-utils-neilb-devel.tar.gz | |
Work towards support new cache in 2.5nfs-utils-1-1-0-pre11neilb-devel
Diffstat (limited to 'utils/exportfs/exportfs.c')
| -rw-r--r-- | utils/exportfs/exportfs.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 60f130e..bbc4aad 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -42,12 +42,14 @@ main(int argc, char **argv) int f_reexport = 0; int f_ignore = 0; int i, c; + int new_cache=0; + int force_flush = 0; xlog_open("exportfs"); export_errno = 0; - while ((c = getopt(argc, argv, "aio:ruv")) != EOF) { + while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) { switch(c) { case 'a': f_all = 1; @@ -68,6 +70,9 @@ main(int argc, char **argv) case 'v': f_verbose = 1; break; + case 'f': + force_flush = 1; + break; default: usage(); break; @@ -92,6 +97,8 @@ main(int argc, char **argv) return 0; } + new_cache = check_new_cache(); + if (f_export && ! f_ignore) export_read(_PATH_EXPORTS); if (f_export) { @@ -116,10 +123,15 @@ main(int argc, char **argv) unexportfs(argv[i], f_verbose); rmtab_read(); } - xtab_mount_read(); - exports_update(f_verbose); + if (!new_cache) { + xtab_mount_read(); + exports_update(f_verbose); + } xtab_export_write(); - xtab_mount_write(); + if (new_cache) + cache_flush(force_flush); + if (!new_cache) + xtab_mount_write(); return export_errno; } @@ -267,19 +279,21 @@ unexportfs(char *arg, int verbose) hname))) continue; if (verbose) { - if (exp->m_exported) { +#if 0 + if (exp->m_exported) printf("unexporting %s:%s from kernel\n", exp->m_client->m_hostname, exp->m_export.e_path); - } - else { + else +#endif printf("unexporting %s:%s\n", exp->m_client->m_hostname, exp->m_export.e_path); - } } +#if 0 if (exp->m_exported && !export_unexport(exp)) error(exp, errno); +#endif exp->m_xtabent = 0; exp->m_mayexport = 0; } @@ -333,8 +347,10 @@ dump(int verbose) c = dumpopt(c, "async"); if (ep->e_flags & NFSEXP_GATHERED_WRITES) c = dumpopt(c, "wdelay"); - if (ep->e_flags & NFSEXP_CROSSMNT) + if (ep->e_flags & NFSEXP_NOHIDE) c = dumpopt(c, "nohide"); + if (ep->e_flags & NFSEXP_CROSSMNT) + c = dumpopt(c, "crossmnt"); if (ep->e_flags & NFSEXP_INSECURE_PORT) c = dumpopt(c, "insecure"); if (ep->e_flags & NFSEXP_ROOTSQUASH) |