summaryrefslogtreecommitdiffstats
path: root/utils/mountd/cache.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2007-02-27 16:35:01 +1100
committerNeil Brown <neilb@suse.de>2007-02-27 16:35:01 +1100
commit57d81b9f4c7f877d64aa7e8c5bddb852e1aa32ce (patch)
treea63865f2b9f009ed0e2b2fe3719a1fab56691be1 /utils/mountd/cache.c
parentfa2058d9dc483dbed373ddc04a898ddd7f135f6f (diff)
parent0b7f54e8954374ebb991ac851accde2c246ae9f8 (diff)
downloadnfs-utils-57d81b9f4c7f877d64aa7e8c5bddb852e1aa32ce.tar.gz
nfs-utils-57d81b9f4c7f877d64aa7e8c5bddb852e1aa32ce.tar.xz
nfs-utils-57d81b9f4c7f877d64aa7e8c5bddb852e1aa32ce.zip
Merge branch 'branch-1-0'
Diffstat (limited to 'utils/mountd/cache.c')
-rw-r--r--utils/mountd/cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index a14f4f2..fbe829e 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -455,6 +455,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
qword_printint(f, exp->e_anonuid);
qword_printint(f, exp->e_anongid);
qword_printint(f, exp->e_fsid);
+ write_fsloc(f, exp, path);
if (exp->e_uuid == NULL) {
char u[16];
if (get_uuid(exp->e_path, NULL, 16, u)) {
@@ -465,7 +466,6 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
qword_print(f, "uuid");
qword_printhex(f, exp->e_uuid, 16);
}
- write_fsloc(f, &exp, path);
}
return qword_eol(f);
}
@@ -548,7 +548,7 @@ void cache_open(void)
int i;
for (i=0; cachelist[i].cache_name; i++ ) {
char path[100];
- if (!manage_gids && cachelist[i].f == auth_unix_gid)
+ if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
continue;
sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
cachelist[i].f = fopen(path, "r+");