diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-08-28 11:17:34 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2008-08-28 11:17:34 -0400 |
| commit | 124b74413e943ab9c02cdff2832d1d81dc9fda87 (patch) | |
| tree | 7b42e1d53a6bf73e79e8af75f4cd62ee6faec290 /utils/mountd | |
| parent | ec16220910f0bf1bf2b8e1d50e78df7da11d8b1e (diff) | |
| download | nfs-utils-124b74413e943ab9c02cdff2832d1d81dc9fda87.tar.gz nfs-utils-124b74413e943ab9c02cdff2832d1d81dc9fda87.tar.xz nfs-utils-124b74413e943ab9c02cdff2832d1d81dc9fda87.zip | |
Remove redundant m_path field
Contrary to the comment above its definition, the field m_path always
has the same value as e_path: the *only* modifications of m_path are all
of the form:
strncpy(exp->m_export.m_path, exp->m_export.e_path,
sizeof (exp->m_export.m_path) - 1);
exp->m_export.m_path[sizeof (exp->m_export.m_path) - 1] = '\0';
So m_path is always just a copy of e_path. In places where we need to
store a path to a submount of a CROSSMNT-exported filesystem, as in
cache.c, we just use a local variable.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mountd')
| -rw-r--r-- | utils/mountd/mountd.c | 12 | ||||
| -rw-r--r-- | utils/mountd/rmtab.c | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index 8137f7f..0facf89 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -230,9 +230,6 @@ mount_umnt_1_svc(struct svc_req *rqstp, dirpath *argp, void *resp) return 1; } - if (!new_cache) - export_reset (exp); - mountlist_del(inet_ntoa(sin->sin_addr), p); return 1; } @@ -312,7 +309,6 @@ mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res) } else if (stat(p, &stb) < 0) { xlog(L_WARNING, "can't stat exported dir %s: %s", p, strerror(errno)); - export_reset (exp); return 1; } @@ -328,8 +324,6 @@ mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res) res->pc_mask[0] = 0; res->pc_mask[1] = 0; - export_reset (exp); - return 1; } @@ -457,13 +451,11 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, mountstat3 *error, int v3) if (fh != NULL) { mountlist_add(inet_ntoa(sin->sin_addr), p); *error = NFS_OK; - export_reset (exp); return fh; } xlog(L_WARNING, "getfh failed: %s", strerror(errno)); *error = NFSERR_ACCES; } - export_reset (exp); return NULL; } @@ -499,14 +491,14 @@ get_exportlist(void) for (i = 0; i < MCL_MAXTYPES; i++) { for (exp = exportlist[i]; exp; exp = exp->m_next) { for (e = elist; e != NULL; e = e->ex_next) { - if (!strcmp(exp->m_export.m_path, e->ex_dir)) + if (!strcmp(exp->m_export.e_path, e->ex_dir)) break; } if (!e) { e = (struct exportnode *) xmalloc(sizeof(*e)); e->ex_next = elist; e->ex_groups = NULL; - e->ex_dir = xstrdup(exp->m_export.m_path); + e->ex_dir = xstrdup(exp->m_export.e_path); elist = e; } diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c index e8aff5a..5787ed6 100644 --- a/utils/mountd/rmtab.c +++ b/utils/mountd/rmtab.c @@ -162,10 +162,8 @@ mountlist_del_all(struct sockaddr_in *sin) } while ((rep = getrmtabent(1, NULL)) != NULL) { if (strcmp(rep->r_client, hp->h_name) == 0 && - (exp = auth_authenticate("umountall", sin, rep->r_path))) { - export_reset(exp); + (exp = auth_authenticate("umountall", sin, rep->r_path))) continue; - } fputrmtabent(fp, rep, NULL); } if (slink_safe_rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) { |