d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include definition for struct namecache (it isn't exported via any header)

Browse Source 
so this builds again. Replace hardcoded name length magic with NAME_MAX.
This commit is contained in:
Kelly Yancey 2002-01-02 06:25:39 +00:00
parent 8d2a504e49
commit f1d24f0dfd
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/diag/dumpvfscache/dumpvfscache.c
View File

@ -5,9 +5,11 @@
#include <fcntl.h> #include <fcntl.h>
#include <kvm.h> #include <kvm.h>
#include <nlist.h> #include <nlist.h>
#include <sysexits.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/namei.h> #include <sys/namei.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/vnode.h> #include <sys/vnode.h>
/*----------------------------------*/ /*----------------------------------*/
@ -18,6 +20,18 @@ static u_int crc16_table[16] = {
0x5000, 0x9C01, 0x8801, 0x4400 0x5000, 0x9C01, 0x8801, 0x4400
}; };
/* XXX Taken from sys/kern/vfs_cache.c */
struct namecache {
LIST_ENTRY(namecache) nc_hash;
LIST_ENTRY(namecache) nc_src;
TAILQ_ENTRY(namecache) nc_dst;
struct vnode *nc_dvp;
struct vnode *nc_vp;
u_char nc_flag;
u_char nc_nlen;
char nc_name[0];
};
static u_short static u_short
wlpsacrc(u_char *buf, u_int len) wlpsacrc(u_char *buf, u_int len)
{ {
@ -59,14 +73,16 @@ main(int argc, char **argv)
struct namecache *nc; struct namecache *nc;
struct vnode vn; struct vnode vn;
kvm_t *kvm = kvm_open(0, 0, 0, O_RDONLY, 0); kvm_t *kvm = kvm_open(NULL, NULL, NULL, O_RDONLY, argv[0]);
if (kvm == NULL)
return(EX_OSERR);
printf("kvm: %p\n", kvm); printf("kvm: %p\n", kvm);
printf("kvm_nlist: %d\n", kvm_nlist(kvm, nl)); printf("kvm_nlist: %d\n", kvm_nlist(kvm, nl));
kvm_read(kvm, nl[0].n_value, &nchash, sizeof nchash); kvm_read(kvm, nl[0].n_value, &nchash, sizeof nchash);
nchash++; nchash++;
nchashtbl = malloc(nchash * sizeof *nchashtbl); nchashtbl = malloc(nchash * sizeof *nchashtbl);
nc = malloc(sizeof *nc + 400); nc = malloc(sizeof *nc + NAME_MAX);
newbucket = malloc(nchash * sizeof (int)); newbucket = malloc(nchash * sizeof (int));
memset(newbucket, 0, nchash * sizeof (int)); memset(newbucket, 0, nchash * sizeof (int));
kvm_read(kvm, nl[1].n_value, &p, sizeof p); kvm_read(kvm, nl[1].n_value, &p, sizeof p);
@ -79,7 +95,7 @@ main(int argc, char **argv)
p = (u_long)LIST_FIRST(nchashtbl+i); p = (u_long)LIST_FIRST(nchashtbl+i);
while (p) { while (p) {
nb++; nb++;
kvm_read(kvm, p, nc, sizeof *nc + 400); kvm_read(kvm, p, nc, sizeof *nc + NAME_MAX);
kvm_read(kvm, (u_long)nc->nc_dvp, &vn, sizeof vn); kvm_read(kvm, (u_long)nc->nc_dvp, &vn, sizeof vn);
nc->nc_name[nc->nc_nlen] = '\0'; nc->nc_name[nc->nc_nlen] = '\0';
for (j=k=kn=0;nc->nc_name[j];j++) { for (j=k=kn=0;nc->nc_name[j];j++) {