diff options
| author | Fred Isaman <iisaman@citi.umich.edu> | 2007-02-22 15:48:53 +1100 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-02-22 15:48:53 +1100 |
| commit | 5fb04a376e6d5ba940e66507e4a615f4e94116e6 (patch) | |
| tree | fc75ece9014d7fd730cae73792adb681fc473d5f /support | |
| parent | 66d8e2870b8d3e91c27a66ebc85e012a3cda9c69 (diff) | |
Extend the exportfs interface to pass fslocations info into the kernel.
Extend exportfs interface to pass fslocations info into the kernel,
using syntax modelled after AIX. Adds "refer=" and "replicas="
options to /etc/exports to enable use of the kernel fslocation code.
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'support')
| -rw-r--r-- | support/include/exportfs.h | 7 | ||||
| -rw-r--r-- | support/include/nfslib.h | 2 | ||||
| -rw-r--r-- | support/nfs/exports.c | 37 |
3 files changed, 45 insertions, 1 deletions
diff --git a/support/include/exportfs.h b/support/include/exportfs.h index 10f38c7..458611b 100644 --- a/support/include/exportfs.h +++ b/support/include/exportfs.h @@ -23,6 +23,13 @@ enum { MCL_MAXTYPES }; +enum { + FSLOC_NONE = 0, + FSLOC_REFER, + FSLOC_REPLICA, + FSLOC_STUB +}; + typedef struct mclient { struct mclient * m_next; char m_hostname[NFSCLNT_IDMAX+1]; diff --git a/support/include/nfslib.h b/support/include/nfslib.h index 13a89da..c085029 100644 --- a/support/include/nfslib.h +++ b/support/include/nfslib.h @@ -80,6 +80,8 @@ struct exportent { int e_nsqgids; int e_fsid; char * e_mountpoint; + int e_fslocmethod; + char * e_fslocdata; char * e_uuid; }; diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 0994ea2..31b38c3 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -100,6 +100,8 @@ getexportent(int fromkernel, int fromexports) def_ee.e_squids = NULL; def_ee.e_sqgids = NULL; def_ee.e_mountpoint = NULL; + def_ee.e_fslocmethod = FSLOC_NONE; + def_ee.e_fslocdata = NULL; def_ee.e_nsquids = 0; def_ee.e_nsqgids = 0; @@ -225,7 +227,22 @@ putexportent(struct exportent *ep) if (ep->e_mountpoint) fprintf(fp, "mountpoint%s%s,", ep->e_mountpoint[0]?"=":"", ep->e_mountpoint); - + switch (ep->e_fslocmethod) { + case FSLOC_NONE: + break; + case FSLOC_REFER: + fprintf(fp, "refer=%s,", ep->e_fslocdata); + break; + case FSLOC_REPLICA: + fprintf(fp, "replicas=%s,", ep->e_fslocdata); + break; + case FSLOC_STUB: + fprintf(fp, "fsloc=stub,"); + break; + default: + xlog(L_ERROR, "unknown fsloc method for %s:%s", + ep->e_hostname, ep->e_path); + } fprintf(fp, "mapping="); switch (ep->e_maptype) { case CLE_MAP_IDENT: @@ -288,6 +305,8 @@ dupexportent(struct exportent *dst, struct exportent *src) } if (src->e_mountpoint) dst->e_mountpoint = strdup(src->e_mountpoint); + if (src->e_fslocdata) + dst->e_fslocdata = strdup(src->e_fslocdata); } struct exportent * @@ -302,6 +321,8 @@ mkexportent(char *hname, char *path, char *options) ee.e_squids = NULL; ee.e_sqgids = NULL; ee.e_mountpoint = NULL; + ee.e_fslocmethod = FSLOC_NONE; + ee.e_fslocdata = NULL; ee.e_nsquids = 0; ee.e_nsqgids = 0; ee.e_uuid = NULL; @@ -483,6 +504,20 @@ bad_option: ep->e_mountpoint = strdup(mp+1); else ep->e_mountpoint = strdup(""); + } else if (strncmp(opt, "fsloc=", 6) == 0) { + if (strcmp(opt+6, "stub") == 0) + ep->e_fslocmethod = FSLOC_STUB; + else { + xlog(L_ERROR, "%s:%d: bad option %s\n", + flname, flline, opt); + goto bad_option; + } + } else if (strncmp(opt, "refer=", 6) == 0) { + ep->e_fslocmethod = FSLOC_REFER; + ep->e_fslocdata = strdup(opt+6); + } else if (strncmp(opt, "replicas=", 9) == 0) { + ep->e_fslocmethod = FSLOC_REPLICA; + ep->e_fslocdata = strdup(opt+9); } else { xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n", flname, flline, opt); |