Commit f0152514 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] knfsd cleanups

exp_procfs_exports() switched to seq_..., missing lock added.
parent 5278b4c3
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/seq_file.h>
#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h> #include <linux/nfsd/nfsd.h>
...@@ -514,6 +515,67 @@ exp_getclientbyname(char *ident) ...@@ -514,6 +515,67 @@ exp_getclientbyname(char *ident)
return NULL; return NULL;
} }
/* Iterator */
static void *e_start(struct seq_file *m, loff_t *pos)
{
loff_t n = *pos;
unsigned client, export;
svc_client *clp;
struct list_head *p;
exp_readlock();
if (!n--)
return (void *)1;
client = n >> 32;
export = n & ((1LL<<32) - 1);
for (clp = clients; client && clp; clp = clp->cl_next, client--)
;
if (!clp)
return NULL;
list_for_each(p, &clp->cl_list)
if (!export--)
return list_entry(p, svc_export, ex_list);
n &= ~((1LL<<32) - 1);
do {
clp = clp->cl_next;
n += 1LL<<32;
} while(clp && list_empty(&clp->cl_list));
if (!clp)
return NULL;
*pos = n+1;
return list_entry(clp->cl_list.next, svc_export, ex_list);
}
static void *e_next(struct seq_file *m, void *p, loff_t *pos)
{
svc_export *exp = p;
svc_client *clp;
if (p == (void *)1)
clp = clients;
else if (exp->ex_list.next == &exp->ex_client->cl_list)
clp = exp->ex_client->cl_next;
else {
++*pos;
return list_entry(exp->ex_list.next, svc_export, ex_list);
}
*pos &= ~((1LL<<32) - 1);
while (clp && list_empty(&clp->cl_list)) {
clp = clp->cl_next;
*pos += 1LL<<32;
}
if (!clp)
return NULL;
++*pos;
return list_entry(clp->cl_list.next, svc_export, ex_list);
}
static void e_stop(struct seq_file *m, void *p)
{
exp_unlock();
}
struct flags { struct flags {
int flag; int flag;
char *name[2]; char *name[2];
...@@ -536,129 +598,77 @@ struct flags { ...@@ -536,129 +598,77 @@ struct flags {
{ 0, {"", ""}} { 0, {"", ""}}
}; };
static int static void exp_flags(struct seq_file *m, int flag)
exp_flags(char *buffer, int flag)
{ {
int len = 0, first = 0; int first = 0;
struct flags *flg = expflags; struct flags *flg;
for (;flg->flag;flg++) { for (flg = expflags; flg->flag; flg++) {
int state = (flg->flag & flag)?0:1; int state = (flg->flag & flag)?0:1;
if (!flg->flag) if (*flg->name[state])
break; seq_printf(m, "%s%s", first++?",":"", flg->name[state]);
if (*flg->name[state]) {
len += sprintf(buffer + len, "%s%s",
first++?",":"", flg->name[state]);
}
} }
return len;
} }
static inline void mangle(struct seq_file *m, const char *s)
{
/* mangling borrowed from fs/super.c */ seq_escape(m, s, " \t\n\\");
/* Use octal escapes, like mount does, for embedded spaces etc. */
static unsigned char need_escaping[] = { ' ', '\t', '\n', '\\' };
static int
mangle(const unsigned char *s, char *buf, int len) {
char *sp;
int n;
sp = buf;
while(*s && sp-buf < len-3) {
for (n = 0; n < sizeof(need_escaping); n++) {
if (*s == need_escaping[n]) {
*sp++ = '\\';
*sp++ = '0' + ((*s & 0300) >> 6);
*sp++ = '0' + ((*s & 070) >> 3);
*sp++ = '0' + (*s & 07);
goto next;
}
}
*sp++ = *s;
next:
s++;
}
return sp - buf; /* no trailing NUL */
} }
#define FREEROOM ((int)PAGE_SIZE-200-len) static int e_show(struct seq_file *m, void *p)
#define MANGLE(s) len += mangle((s), buffer+len, FREEROOM);
int
exp_procfs_exports(char *buffer, char **start, off_t offset,
int length, int *eof, void *data)
{ {
struct svc_clnthash **hp, **head, *tmp; struct svc_export *exp = p;
struct svc_client *clp; struct svc_client *clp;
svc_export *exp; int j, first = 0;
off_t pos = 0;
off_t begin = 0;
int len = 0;
int j;
len += sprintf(buffer, "# Version 1.1\n");
len += sprintf(buffer+len, "# Path Client(Flags) # IPs\n");
for (clp = clients; clp; clp = clp->cl_next) { if (p == (void *)1) {
struct list_head *list = &clp->cl_list; seq_puts(m, "# Version 1.1\n");
struct list_head *p; seq_puts(m, "# Path Client(Flags) # IPs\n");
return 0;
list_for_each(p, list) { }
int first = 0;
exp = list_entry(p, svc_export, ex_list); clp = exp->ex_client;
MANGLE(exp->ex_path);
buffer[len++]='\t';
MANGLE(clp->cl_ident);
buffer[len++]='(';
len += exp_flags(buffer+len, exp->ex_flags); mangle(m, exp->ex_path);
len += sprintf(buffer+len, ") # "); seq_putc(m, '\t');
mangle(m, clp->cl_ident);
seq_putc(m, '(');
exp_flags(m, exp->ex_flags);
seq_puts(m, ") # ");
for (j = 0; j < clp->cl_naddr; j++) { for (j = 0; j < clp->cl_naddr; j++) {
struct svc_clnthash **hp, **head, *tmp;
struct in_addr addr = clp->cl_addr[j]; struct in_addr addr = clp->cl_addr[j];
head = &clnt_hash[CLIENT_HASH(addr.s_addr)]; head = &clnt_hash[CLIENT_HASH(addr.s_addr)];
for (hp = head; (tmp = *hp) != NULL; hp = &(tmp->h_next)) { for (hp = head; (tmp = *hp) != NULL; hp = &(tmp->h_next)) {
if (tmp->h_addr.s_addr == addr.s_addr) { if (tmp->h_addr.s_addr == addr.s_addr)
if (first++) len += sprintf(buffer+len, "%s", " "); break;
}
if (tmp) {
if (first++)
seq_putc(m, ' ');
if (tmp->h_client != clp) if (tmp->h_client != clp)
len += sprintf(buffer+len, "("); seq_putc(m, '(');
len += sprintf(buffer+len, "%d.%d.%d.%d", seq_printf(m, "%d.%d.%d.%d",
htonl(addr.s_addr) >> 24 & 0xff, htonl(addr.s_addr) >> 24 & 0xff,
htonl(addr.s_addr) >> 16 & 0xff, htonl(addr.s_addr) >> 16 & 0xff,
htonl(addr.s_addr) >> 8 & 0xff, htonl(addr.s_addr) >> 8 & 0xff,
htonl(addr.s_addr) >> 0 & 0xff); htonl(addr.s_addr) >> 0 & 0xff);
if (tmp->h_client != clp) if (tmp->h_client != clp)
len += sprintf(buffer+len, ")"); seq_putc(m, ')');
break;
}
}
}
buffer[len++]='\n';
pos=begin+len;
if(pos<offset) {
len=0;
begin=pos;
}
if (pos > offset + length)
goto done;
} }
} }
seq_putc(m, '\n');
*eof = 1; return 0;
done:
*start = buffer + (offset - begin);
len -= (offset - begin);
if ( len > length )
len = length;
return len;
} }
struct seq_operations nfs_exports_op = {
start: e_start,
next: e_next,
stop: e_stop,
show: e_show,
};
/* /*
* Add or modify a client. * Add or modify a client.
* Change requests may involve the list of host addresses. The list of * Change requests may involve the list of host addresses. The list of
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/nfs.h> #include <linux/nfs.h>
#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svc.h>
...@@ -45,17 +46,28 @@ static int nfsctl_ugidupdate(struct nfsctl_ugidmap *data); ...@@ -45,17 +46,28 @@ static int nfsctl_ugidupdate(struct nfsctl_ugidmap *data);
static int initialized; static int initialized;
int exp_procfs_exports(char *buffer, char **start, off_t offset, extern struct seq_operations nfs_exports_op;
int length, int *eof, void *data); static int exports_open(struct inode *inode, struct file *file)
{
return seq_open(file, &nfs_exports_op);
}
static struct file_operations exports_operations = {
open: exports_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
};
void proc_export_init(void) void proc_export_init(void)
{ {
struct proc_dir_entry *entry;
if (!proc_mkdir("fs/nfs", 0)) if (!proc_mkdir("fs/nfs", 0))
return; return;
create_proc_read_entry("fs/nfs/exports", 0, 0, exp_procfs_exports,NULL); entry = create_proc_entry("fs/nfs/exports", 0, NULL);
if (entry)
entry->proc_fops = &exports_operations;
} }
/* /*
* Initialize nfsd * Initialize nfsd
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment