Clean up: Squelch compiler warnings and document public parts of
cache API.
cache.c: At top level:
cache.c:67: warning: no previous prototype for auth_unix_ip
cache.c:123: warning: no previous prototype for auth_unix_gid
cache.c:217: warning: no previous prototype for get_uuid
cache.c:247: warning: no previous prototype for uuid_by_path
cache.c:326: warning: no previous prototype for nfsd_fh
cache.c:745: warning: no previous prototype for nfsd_export
cache.c:820: warning: no previous prototype for cache_open
cache.c:832: warning: no previous prototype for cache_set_fd
cache.c:841: warning: no previous prototype for
cache_process_req
cache.c:921: warning: no previous prototype for cache_export
cache.c:953: warning: no previous prototype for
cache_get_filehandle
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
#include "blkid/blkid.h"
#endif
#include "blkid/blkid.h"
#endif
+/*
+ * Invoked by RPC service loop
+ */
+void cache_set_fds(fd_set *fdset);
+int cache_process_req(fd_set *readfds);
enum nfsd_fsid {
FSID_DEV = 0,
enum nfsd_fsid {
FSID_DEV = 0,
* Record is terminated with newline.
*
*/
* Record is terminated with newline.
*
*/
-int cache_export_ent(char *domain, struct exportent *exp, char *p);
+static int cache_export_ent(char *domain, struct exportent *exp, char *p);
char *lbuf = NULL;
int lbuflen = 0;
extern int use_ipaddr;
char *lbuf = NULL;
int lbuflen = 0;
extern int use_ipaddr;
-void auth_unix_ip(FILE *f)
+static void auth_unix_ip(FILE *f)
{
/* requests are
* class IP-ADDR
{
/* requests are
* class IP-ADDR
-void auth_unix_gid(FILE *f)
+static void auth_unix_gid(FILE *f)
#define get_uuid_blkdev(path) (NULL)
#endif
#define get_uuid_blkdev(path) (NULL)
#endif
-int get_uuid(const char *val, int uuidlen, char *u)
+static int get_uuid(const char *val, int uuidlen, char *u)
{
/* extract hex digits from uuidstr and compose a uuid
* of the given length (max 16), xoring bytes to make
{
/* extract hex digits from uuidstr and compose a uuid
* of the given length (max 16), xoring bytes to make
-int uuid_by_path(char *path, int type, int uuidlen, char *uuid)
+static int uuid_by_path(char *path, int type, int uuidlen, char *uuid)
{
/* get a uuid for the filesystem found at 'path'.
* There are several possible ways of generating the
{
/* get a uuid for the filesystem found at 'path'.
* There are several possible ways of generating the
+static void nfsd_fh(FILE *f)
{
/* request are:
* domain fsidtype fsid
{
/* request are:
* domain fsidtype fsid
-void nfsd_export(FILE *f)
+static void nfsd_export(FILE *f)
{
/* requests are:
* domain path
{
/* requests are:
* domain path
};
extern int manage_gids;
};
extern int manage_gids;
+
+/**
+ * cache_open - prepare communications channels with kernel RPC caches
+ *
+ */
void cache_open(void)
{
int i;
void cache_open(void)
{
int i;
+/**
+ * cache_set_fds - prepare cache file descriptors for one iteration of the service loop
+ * @fdset: pointer to fd_set to prepare
+ */
void cache_set_fds(fd_set *fdset)
{
int i;
void cache_set_fds(fd_set *fdset)
{
int i;
+/**
+ * cache_process_req - process any active cache file descriptors during service loop iteration
+ * @fdset: pointer to fd_set to examine for activity
+ */
int cache_process_req(fd_set *readfds)
{
int i;
int cache_process_req(fd_set *readfds)
{
int i;
* % echo $domain $path $[now+30*60] $options $anonuid $anongid $fsid > /proc/net/rpc/nfsd.export/channel
*/
* % echo $domain $path $[now+30*60] $options $anonuid $anongid $fsid > /proc/net/rpc/nfsd.export/channel
*/
-int cache_export_ent(char *domain, struct exportent *exp, char *path)
+static int cache_export_ent(char *domain, struct exportent *exp, char *path)
{
int err;
FILE *f = fopen("/proc/net/rpc/nfsd.export/channel", "w");
{
int err;
FILE *f = fopen("/proc/net/rpc/nfsd.export/channel", "w");
+/**
+ * cache_export - Inform kernel of a new nfs_export
+ * @exp: target nfs_export
+ * @path: NUL-terminated C string containing export path
+ */
int cache_export(nfs_export *exp, char *path)
{
char buf[INET_ADDRSTRLEN];
int cache_export(nfs_export *exp, char *path)
{
char buf[INET_ADDRSTRLEN];
+/**
+ * cache_get_filehandle - given an nfs_export, get its root filehandle
+ * @exp: target nfs_export
+ * @len: length of requested file handle
+ * @p: NUL-terminated C string containing export path
+ *
+ * Returns pointer to NFS file handle of root directory of export
+ *
* {
* echo $domain $path $length
* read filehandle <&0
* {
* echo $domain $path $length
* read filehandle <&0
fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
return &fh;
}
fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
return &fh;
}
#include "rpcmisc.h"
#include "pseudoflavors.h"
#include "rpcmisc.h"
#include "pseudoflavors.h"
-extern void cache_open(void);
-extern struct nfs_fh_len *cache_get_filehandle(nfs_export *exp, int len, char *p);
-extern int cache_export(nfs_export *exp, char *path);
-
extern void my_svc_run(void);
static void usage(const char *, int exitcode);
extern void my_svc_run(void);
static void usage(const char *, int exitcode);
void mountlist_del_all(const struct sockaddr *sap);
mountlist mountlist_list(void);
void mountlist_del_all(const struct sockaddr *sap);
mountlist mountlist_list(void);
+void cache_open(void);
+struct nfs_fh_len *
+ cache_get_filehandle(nfs_export *exp, int len, char *p);
+int cache_export(nfs_export *exp, char *path);