summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Coffman <kwc@citi.umich.edu>2007-02-27 15:26:44 +1100
committerNeil Brown <neilb@suse.de>2007-02-27 15:26:44 +1100
commitdf28816565a26386690662ace4d38bb00e090297 (patch)
treefce4ef0861ec68281cacadd3a984cbfe5f8d65a2
parentec75fd41fcf2b07e604d154ebc2ebafb119fbd25 (diff)
downloadnfs-utils-df28816565a26386690662ace4d38bb00e090297.tar.gz
nfs-utils-df28816565a26386690662ace4d38bb00e090297.tar.xz
nfs-utils-df28816565a26386690662ace4d38bb00e090297.zip
Fix reference error when writing fsloc data to cache
Use the correct pointer when writing fslocations data to the cache. Also write the fsloc stuff before the uuid stuff so userland code will work with or without the uuid kernel patches. Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--utils/mountd/cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index a14f4f2..5f0d12a 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);
}