Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.39 retrieving revision 1.87 diff -u -p -r1.39 -r1.87 --- src/sys/miscfs/kernfs/kernfs_vnops.c 1995/10/09 14:25:02 1.39 +++ src/sys/miscfs/kernfs/kernfs_vnops.c 2003/06/29 18:43:33 1.87 @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.39 1995/10/09 14:25:02 mycroft Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.87 2003/06/29 18:43:33 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -35,18 +35,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)kernfs_vnops.c 8.9 (Berkeley) 6/15/94 + * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 */ /* * Kernel parameter filesystem (/kern) */ +#include +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.87 2003/06/29 18:43:33 thorpej Exp $"); + #include #include #include #include -#include #include #include #include @@ -58,8 +60,12 @@ #include #include #include + +#include #include +#include + #define KSTRING 256 /* Largest I/O available via this filesystem */ #define UIO_MX 32 @@ -67,35 +73,21 @@ #define WRITE_MODE (S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH) #define DIR_MODE (S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) -struct kern_target { - u_char kt_type; - u_char kt_namlen; - char *kt_name; - void *kt_data; -#define KTT_NULL 1 -#define KTT_TIME 5 -#define KTT_INT 17 -#define KTT_STRING 31 -#define KTT_HOSTNAME 47 -#define KTT_AVENRUN 53 -#define KTT_DEVICE 71 -#define KTT_MSGBUF 89 - u_char kt_tag; - u_char kt_vtype; - mode_t kt_mode; -} kern_targets[] = { +const struct kern_target kern_targets[] = { /* NOTE: The name must be less than UIO_MX-16 chars in length */ #define N(s) sizeof(s)-1, s /* name data tag type ro/rw */ { DT_DIR, N("."), 0, KTT_NULL, VDIR, DIR_MODE }, { DT_DIR, N(".."), 0, KTT_NULL, VDIR, DIR_MODE }, { DT_REG, N("boottime"), &boottime.tv_sec, KTT_INT, VREG, READ_MODE }, - { DT_REG, N("copyright"), copyright, KTT_STRING, VREG, READ_MODE }, + /* XXX cast away const */ + { DT_REG, N("copyright"), (void *)copyright, + KTT_STRING, VREG, READ_MODE }, { DT_REG, N("hostname"), 0, KTT_HOSTNAME, VREG, WRITE_MODE }, { DT_REG, N("hz"), &hz, KTT_INT, VREG, READ_MODE }, { DT_REG, N("loadavg"), 0, KTT_AVENRUN, VREG, READ_MODE }, { DT_REG, N("msgbuf"), 0, KTT_MSGBUF, VREG, READ_MODE }, - { DT_REG, N("pagesize"), &cnt.v_page_size, KTT_INT, VREG, READ_MODE }, + { DT_REG, N("pagesize"), &uvmexp.pagesize, KTT_INT, VREG, READ_MODE }, { DT_REG, N("physmem"), &physmem, KTT_INT, VREG, READ_MODE }, #if 0 { DT_DIR, N("root"), 0, KTT_NULL, VDIR, DIR_MODE }, @@ -103,17 +95,116 @@ struct kern_target { { DT_BLK, N("rootdev"), &rootdev, KTT_DEVICE, VBLK, READ_MODE }, { DT_CHR, N("rrootdev"), &rrootdev, KTT_DEVICE, VCHR, READ_MODE }, { DT_REG, N("time"), 0, KTT_TIME, VREG, READ_MODE }, - { DT_REG, N("version"), version, KTT_STRING, VREG, READ_MODE }, + /* XXX cast away const */ + { DT_REG, N("version"), (void *)version, + KTT_STRING, VREG, READ_MODE }, #undef N }; static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); -int -kernfs_xread(kt, off, bufp, len) - struct kern_target *kt; +int kernfs_lookup __P((void *)); +#define kernfs_create genfs_eopnotsupp +#define kernfs_mknod genfs_eopnotsupp +#define kernfs_open genfs_nullop +#define kernfs_close genfs_nullop +int kernfs_access __P((void *)); +int kernfs_getattr __P((void *)); +int kernfs_setattr __P((void *)); +int kernfs_read __P((void *)); +int kernfs_write __P((void *)); +#define kernfs_fcntl genfs_fcntl +#define kernfs_ioctl genfs_enoioctl +#define kernfs_poll genfs_poll +#define kernfs_revoke genfs_revoke +#define kernfs_fsync genfs_nullop +#define kernfs_seek genfs_nullop +#define kernfs_remove genfs_eopnotsupp +int kernfs_link __P((void *)); +#define kernfs_rename genfs_eopnotsupp +#define kernfs_mkdir genfs_eopnotsupp +#define kernfs_rmdir genfs_eopnotsupp +int kernfs_symlink __P((void *)); +int kernfs_readdir __P((void *)); +#define kernfs_readlink genfs_eopnotsupp +#define kernfs_abortop genfs_abortop +int kernfs_inactive __P((void *)); +int kernfs_reclaim __P((void *)); +#define kernfs_lock genfs_lock +#define kernfs_unlock genfs_unlock +#define kernfs_bmap genfs_badop +#define kernfs_strategy genfs_badop +int kernfs_print __P((void *)); +#define kernfs_islocked genfs_islocked +int kernfs_pathconf __P((void *)); +#define kernfs_advlock genfs_einval +#define kernfs_blkatoff genfs_eopnotsupp +#define kernfs_valloc genfs_eopnotsupp +#define kernfs_vfree genfs_nullop +#define kernfs_truncate genfs_eopnotsupp +#define kernfs_update genfs_nullop +#define kernfs_bwrite genfs_eopnotsupp +#define kernfs_putpages genfs_putpages + +static int kernfs_xread __P((const struct kern_target *, int, char **, size_t, size_t *)); +static int kernfs_xwrite __P((const struct kern_target *, char *, size_t)); + +int (**kernfs_vnodeop_p) __P((void *)); +const struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { + { &vop_default_desc, vn_default_error }, + { &vop_lookup_desc, kernfs_lookup }, /* lookup */ + { &vop_create_desc, kernfs_create }, /* create */ + { &vop_mknod_desc, kernfs_mknod }, /* mknod */ + { &vop_open_desc, kernfs_open }, /* open */ + { &vop_close_desc, kernfs_close }, /* close */ + { &vop_access_desc, kernfs_access }, /* access */ + { &vop_getattr_desc, kernfs_getattr }, /* getattr */ + { &vop_setattr_desc, kernfs_setattr }, /* setattr */ + { &vop_read_desc, kernfs_read }, /* read */ + { &vop_write_desc, kernfs_write }, /* write */ + { &vop_fcntl_desc, kernfs_fcntl }, /* fcntl */ + { &vop_ioctl_desc, kernfs_ioctl }, /* ioctl */ + { &vop_poll_desc, kernfs_poll }, /* poll */ + { &vop_revoke_desc, kernfs_revoke }, /* revoke */ + { &vop_fsync_desc, kernfs_fsync }, /* fsync */ + { &vop_seek_desc, kernfs_seek }, /* seek */ + { &vop_remove_desc, kernfs_remove }, /* remove */ + { &vop_link_desc, kernfs_link }, /* link */ + { &vop_rename_desc, kernfs_rename }, /* rename */ + { &vop_mkdir_desc, kernfs_mkdir }, /* mkdir */ + { &vop_rmdir_desc, kernfs_rmdir }, /* rmdir */ + { &vop_symlink_desc, kernfs_symlink }, /* symlink */ + { &vop_readdir_desc, kernfs_readdir }, /* readdir */ + { &vop_readlink_desc, kernfs_readlink }, /* readlink */ + { &vop_abortop_desc, kernfs_abortop }, /* abortop */ + { &vop_inactive_desc, kernfs_inactive }, /* inactive */ + { &vop_reclaim_desc, kernfs_reclaim }, /* reclaim */ + { &vop_lock_desc, kernfs_lock }, /* lock */ + { &vop_unlock_desc, kernfs_unlock }, /* unlock */ + { &vop_bmap_desc, kernfs_bmap }, /* bmap */ + { &vop_strategy_desc, kernfs_strategy }, /* strategy */ + { &vop_print_desc, kernfs_print }, /* print */ + { &vop_islocked_desc, kernfs_islocked }, /* islocked */ + { &vop_pathconf_desc, kernfs_pathconf }, /* pathconf */ + { &vop_advlock_desc, kernfs_advlock }, /* advlock */ + { &vop_blkatoff_desc, kernfs_blkatoff }, /* blkatoff */ + { &vop_valloc_desc, kernfs_valloc }, /* valloc */ + { &vop_vfree_desc, kernfs_vfree }, /* vfree */ + { &vop_truncate_desc, kernfs_truncate }, /* truncate */ + { &vop_update_desc, kernfs_update }, /* update */ + { &vop_bwrite_desc, kernfs_bwrite }, /* bwrite */ + { &vop_putpages_desc, kernfs_putpages }, /* putpages */ + { NULL, NULL } +}; +const struct vnodeopv_desc kernfs_vnodeop_opv_desc = + { &kernfs_vnodeop_p, kernfs_vnodeop_entries }; + +static int +kernfs_xread(kt, off, bufp, len, wrlen) + const struct kern_target *kt; int off; char **bufp; - int len; + size_t len; + size_t *wrlen; { switch (kt->kt_tag) { @@ -121,7 +212,7 @@ kernfs_xread(kt, off, bufp, len) struct timeval tv; microtime(&tv); - sprintf(*bufp, "%d %d\n", tv.tv_sec, tv.tv_usec); + sprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec); break; } @@ -140,17 +231,37 @@ kernfs_xread(kt, off, bufp, len) } case KTT_MSGBUF: { - extern struct msgbuf *msgbufp; long n; - if (off >= MSG_BSIZE) + /* + * deal with cases where the message buffer has + * become corrupted. + */ + if (!msgbufenabled || msgbufp->msg_magic != MSG_MAGIC) { + msgbufenabled = 0; + return (ENXIO); + } + + /* + * Note that reads of /kern/msgbuf won't necessarily yield + * consistent results, if the message buffer is modified + * while the read is in progress. The worst that can happen + * is that incorrect data will be read. There's no way + * that this can crash the system unless the values in the + * message buffer header are corrupted, but that'll cause + * the system to die anyway. + */ + if (off >= msgbufp->msg_bufs) { + *wrlen = 0; return (0); + } n = msgbufp->msg_bufx + off; - if (n >= MSG_BSIZE) - n -= MSG_BSIZE; - len = min(MSG_BSIZE - n, MSG_BSIZE - off); + if (n >= msgbufp->msg_bufs) + n -= msgbufp->msg_bufs; + len = min(msgbufp->msg_bufs - n, msgbufp->msg_bufs - off); *bufp = msgbufp->msg_bufc + n; - return (len); + *wrlen = len; + return (0); } case KTT_HOSTNAME: { @@ -160,7 +271,7 @@ kernfs_xread(kt, off, bufp, len) if (xlen >= (len-2)) return (EINVAL); - bcopy(cp, *bufp, xlen); + memcpy(*bufp, cp, xlen); (*bufp)[xlen] = '\n'; (*bufp)[xlen+1] = '\0'; break; @@ -168,36 +279,40 @@ kernfs_xread(kt, off, bufp, len) case KTT_AVENRUN: averunnable.fscale = FSCALE; - sprintf(*bufp, "%ld %ld %ld %ld\n", + sprintf(*bufp, "%d %d %d %ld\n", averunnable.ldavg[0], averunnable.ldavg[1], averunnable.ldavg[2], averunnable.fscale); break; default: + *wrlen = 0; return (0); } len = strlen(*bufp); if (len <= off) - return (0); - *bufp += off; - return (len - off); + *wrlen = 0; + else { + *bufp += off; + *wrlen = len - off; + } + return (0); } -int +static int kernfs_xwrite(kt, buf, len) - struct kern_target *kt; + const struct kern_target *kt; char *buf; - int len; + size_t len; { switch (kt->kt_tag) { case KTT_HOSTNAME: if (buf[len-1] == '\n') --len; - bcopy(buf, hostname, len); + memcpy(hostname, buf, len); hostname[len] = '\0'; - hostnamelen = len; + hostnamelen = (size_t) len; return (0); default: @@ -210,28 +325,31 @@ kernfs_xwrite(kt, buf, len) * vp is the current namei directory * ndp is the name to locate in that directory... */ -kernfs_lookup(ap) +int +kernfs_lookup(v) + void *v; +{ struct vop_lookup_args /* { struct vnode * a_dvp; struct vnode ** a_vpp; struct componentname * a_cnp; - } */ *ap; -{ + } */ *ap = v; struct componentname *cnp = ap->a_cnp; struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; - char *pname = cnp->cn_nameptr; - struct kern_target *kt; + const char *pname = cnp->cn_nameptr; + const struct kern_target *kt; struct vnode *fvp; - int error, i; + int error, i, wantpunlock; #ifdef KERNFS_DIAGNOSTIC - printf("kernfs_lookup(%x)\n", ap); - printf("kernfs_lookup(dp = %x, vpp = %x, cnp = %x)\n", dvp, vpp, ap->a_cnp); + printf("kernfs_lookup(%p)\n", ap); + printf("kernfs_lookup(dp = %p, vpp = %p, cnp = %p)\n", dvp, vpp, ap->a_cnp); printf("kernfs_lookup(%s)\n", pname); #endif *vpp = NULLVP; + cnp->cn_flags &= ~PDIRUNLOCK; if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS); @@ -239,22 +357,28 @@ kernfs_lookup(ap) if (cnp->cn_namelen == 1 && *pname == '.') { *vpp = dvp; VREF(dvp); - /*VOP_LOCK(dvp);*/ return (0); } + /* + * This code only supports a flat directory, so we don't + * need to worry about .. + */ + #if 0 - if (cnp->cn_namelen == 4 && bcmp(pname, "root", 4) == 0) { + if (cnp->cn_namelen == 4 && memcmp(pname, "root", 4) == 0) { *vpp = rootdir; VREF(rootdir); - VOP_LOCK(rootdir); + vn_lock(rootdir, LK_SHARED | LK_RETRY); return (0); } #endif + wantpunlock = (~cnp->cn_flags & (LOCKPARENT | ISLASTCN)); + for (kt = kern_targets, i = 0; i < nkern_targets; kt++, i++) { if (cnp->cn_namelen == kt->kt_namlen && - bcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) + memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) goto found; } @@ -268,87 +392,97 @@ found: if (kt->kt_tag == KTT_DEVICE) { dev_t *dp = kt->kt_data; loop: - if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) + if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) { return (ENOENT); + } *vpp = fvp; - if (vget(fvp, 1)) + if (vget(fvp, LK_EXCLUSIVE)) goto loop; + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } #ifdef KERNFS_DIAGNOSTIC printf("kernfs_lookup: allocate new vnode\n"); #endif - if (error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, - &fvp)) + error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, &fvp); + if (error) { return (error); + } MALLOC(fvp->v_data, void *, sizeof(struct kernfs_node), M_TEMP, M_WAITOK); VTOKERN(fvp)->kf_kt = kt; fvp->v_type = kt->kt_vtype; + vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY); *vpp = fvp; #ifdef KERNFS_DIAGNOSTIC - printf("kernfs_lookup: newvp = %x\n", fvp); + printf("kernfs_lookup: newvp = %p\n", fvp); #endif - return (0); -} - -kernfs_open(ap) - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - - /* Only need to check access permissions. */ + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } int -kernfs_access(ap) +kernfs_access(v) + void *v; +{ struct vop_access_args /* { struct vnode *a_vp; int a_mode; struct ucred *a_cred; struct proc *a_p; - } */ *ap; -{ + } */ *ap = v; struct vnode *vp = ap->a_vp; - mode_t fmode = - (vp->v_flag & VROOT) ? DIR_MODE : VTOKERN(vp)->kf_kt->kt_mode; + mode_t mode; + + if (vp->v_flag & VROOT) { + mode = DIR_MODE; + } else { + const struct kern_target *kt = VTOKERN(vp)->kf_kt; + mode = kt->kt_mode; + } - return (vaccess(fmode, (uid_t)0, (gid_t)0, ap->a_mode, ap->a_cred)); + return (vaccess(vp->v_type, mode, (uid_t)0, (gid_t)0, ap->a_mode, + ap->a_cred)); } -kernfs_getattr(ap) +int +kernfs_getattr(v) + void *v; +{ struct vop_getattr_args /* { struct vnode *a_vp; struct vattr *a_vap; struct ucred *a_cred; struct proc *a_p; - } */ *ap; -{ + } */ *ap = v; struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; - struct timeval tv; int error = 0; char strbuf[KSTRING], *buf; - bzero((caddr_t) vap, sizeof(*vap)); + memset((caddr_t) vap, 0, sizeof(*vap)); vattr_null(vap); vap->va_uid = 0; vap->va_gid = 0; vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; vap->va_size = 0; vap->va_blocksize = DEV_BSIZE; - microtime(&tv); - TIMEVAL_TO_TIMESPEC(&tv, &vap->va_atime); - vap->va_mtime = vap->va_atime; - vap->va_ctime = vap->va_ctime; + /* + * Make all times be current TOD. Avoid microtime(9), it's slow. + * We don't guard the read from time(9) with splclock(9) since we + * don't actually need to be THAT sure the access is atomic. + */ + TIMEVAL_TO_TIMESPEC(&time, &vap->va_ctime); + vap->va_atime = vap->va_mtime = vap->va_ctime; vap->va_gen = 0; vap->va_flags = 0; vap->va_rdev = 0; @@ -364,19 +498,22 @@ kernfs_getattr(ap) vap->va_fileid = 2; vap->va_size = DEV_BSIZE; } else { - struct kern_target *kt = VTOKERN(vp)->kf_kt; - int nbytes, total; + const struct kern_target *kt = VTOKERN(vp)->kf_kt; + size_t nread, total; #ifdef KERNFS_DIAGNOSTIC printf("kernfs_getattr: stat target %s\n", kt->kt_name); #endif vap->va_type = kt->kt_vtype; vap->va_mode = kt->kt_mode; vap->va_nlink = 1; - vap->va_fileid = 3 + (kt - kern_targets); + vap->va_fileid = 1 + (kt - kern_targets); total = 0; - while (buf = strbuf, - nbytes = kernfs_xread(kt, total, &buf, sizeof(strbuf))) - total += nbytes; + do { + buf = strbuf; + error = kernfs_xread(kt, total, &buf, + sizeof(strbuf), &nread); + total += nread; + } while (error == 0 && nread != 0); vap->va_size = total; } @@ -386,15 +523,11 @@ kernfs_getattr(ap) return (error); } -kernfs_setattr(ap) - struct vop_setattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; +/*ARGSUSED*/ +int +kernfs_setattr(v) + void *v; { - /* * Silently ignore attribute changes. * This allows for open with truncate to have no @@ -405,19 +538,21 @@ kernfs_setattr(ap) } int -kernfs_read(ap) +kernfs_read(v) + void *v; +{ struct vop_read_args /* { struct vnode *a_vp; struct uio *a_uio; int a_ioflag; struct ucred *a_cred; - } */ *ap; -{ + } */ *ap = v; struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - struct kern_target *kt; + const struct kern_target *kt; char strbuf[KSTRING], *buf; - int off, len; + off_t off; + size_t len; int error; if (vp->v_type == VDIR) @@ -430,31 +565,25 @@ kernfs_read(ap) #endif off = uio->uio_offset; -#if 0 - while (buf = strbuf, -#else - if (buf = strbuf, -#endif - len = kernfs_xread(kt, off, &buf, sizeof(strbuf))) { - if (error = uiomove(buf, len, uio)) - return (error); - off += len; - } - return (0); + buf = strbuf; + if ((error = kernfs_xread(kt, off, &buf, sizeof(strbuf), &len)) == 0) + error = uiomove(buf, len, uio); + return (error); } int -kernfs_write(ap) +kernfs_write(v) + void *v; +{ struct vop_write_args /* { struct vnode *a_vp; struct uio *a_uio; int a_ioflag; struct ucred *a_cred; - } */ *ap; -{ + } */ *ap = v; struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - struct kern_target *kt; + const struct kern_target *kt; int error, xlen; char strbuf[KSTRING]; @@ -467,7 +596,7 @@ kernfs_write(ap) return (EINVAL); xlen = min(uio->uio_resid, KSTRING-1); - if (error = uiomove(strbuf, xlen, uio)) + if ((error = uiomove(strbuf, xlen, uio)) != 0) return (error); if (uio->uio_resid != 0) @@ -478,23 +607,25 @@ kernfs_write(ap) return (kernfs_xwrite(kt, strbuf, xlen)); } -kernfs_readdir(ap) +int +kernfs_readdir(v) + void *v; +{ struct vop_readdir_args /* { struct vnode *a_vp; struct uio *a_uio; struct ucred *a_cred; int *a_eofflag; - u_long *a_cookies; - int a_ncookies; - } */ *ap; -{ + off_t **a_cookies; + int a_*ncookies; + } */ *ap = v; struct uio *uio = ap->a_uio; struct dirent d; - struct kern_target *kt; - int i; + const struct kern_target *kt; + off_t i; int error; - u_long *cookies = ap->a_cookies; - int ncookies = ap->a_ncookies; + off_t *cookies = NULL; + int ncookies = 0, nc = 0; if (ap->a_vp->v_type != VDIR) return (ENOTDIR); @@ -506,13 +637,24 @@ kernfs_readdir(ap) error = 0; i = uio->uio_offset; - bzero((caddr_t)&d, UIO_MX); + + if (i >= nkern_targets) + return 0; + + memset((caddr_t)&d, 0, UIO_MX); d.d_reclen = UIO_MX; + if (ap->a_ncookies) { + nc = uio->uio_resid / UIO_MX; + nc = min(nc, (nkern_targets - i)); + cookies = malloc(nc * sizeof(off_t), M_TEMP, M_WAITOK); + *ap->a_cookies = cookies; + } + for (kt = &kern_targets[i]; uio->uio_resid >= UIO_MX && i < nkern_targets; kt++, i++) { #ifdef KERNFS_DIAGNOSTIC - printf("kernfs_readdir: i = %d\n", i); + printf("kernfs_readdir: i = %d\n", (int)i); #endif if (kt->kt_tag == KTT_DEVICE) { @@ -525,46 +667,63 @@ kernfs_readdir(ap) d.d_fileno = i + 3; d.d_namlen = kt->kt_namlen; - bcopy(kt->kt_name, d.d_name, kt->kt_namlen + 1); + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); d.d_type = kt->kt_type; - if (error = uiomove((caddr_t)&d, UIO_MX, uio)) + if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0) break; - if (ncookies-- > 0) + if (cookies) { *cookies++ = i + 1; + ncookies++; + } + } + + if (ap->a_ncookies) { + if (error) { + free(*ap->a_cookies, M_TEMP); + *ap->a_ncookies = 0; + *ap->a_cookies = NULL; + } else + *ap->a_ncookies = ncookies; } uio->uio_offset = i; return (error); } -kernfs_inactive(ap) +int +kernfs_inactive(v) + void *v; +{ struct vop_inactive_args /* { struct vnode *a_vp; - } */ *ap; -{ + struct proc *a_p; + } */ *ap = v; struct vnode *vp = ap->a_vp; #ifdef KERNFS_DIAGNOSTIC - printf("kernfs_inactive(%x)\n", vp); + printf("kernfs_inactive(%p)\n", vp); #endif /* * Clear out the v_type field to avoid * nasty things happening in vgone(). */ + VOP_UNLOCK(vp, 0); vp->v_type = VNON; return (0); } -kernfs_reclaim(ap) +int +kernfs_reclaim(v) + void *v; +{ struct vop_reclaim_args /* { struct vnode *a_vp; - } */ *ap; -{ + } */ *ap = v; struct vnode *vp = ap->a_vp; #ifdef KERNFS_DIAGNOSTIC - printf("kernfs_reclaim(%x)\n", vp); + printf("kernfs_reclaim(%p)\n", vp); #endif if (vp->v_data) { FREE(vp->v_data, M_TEMP); @@ -576,13 +735,15 @@ kernfs_reclaim(ap) /* * Return POSIX pathconf information applicable to special devices. */ -kernfs_pathconf(ap) +int +kernfs_pathconf(v) + void *v; +{ struct vop_pathconf_args /* { struct vnode *a_vp; int a_name; register_t *a_retval; - } */ *ap; -{ + } */ *ap = v; switch (ap->a_name) { case _PC_LINK_MAX: @@ -603,6 +764,9 @@ kernfs_pathconf(ap) case _PC_VDISABLE: *ap->a_retval = _POSIX_VDISABLE; return (0); + case _PC_SYNC_IO: + *ap->a_retval = 1; + return (0); default: return (EINVAL); } @@ -613,135 +777,43 @@ kernfs_pathconf(ap) * Print out the contents of a /dev/fd vnode. */ /* ARGSUSED */ -kernfs_print(ap) - struct vop_print_args /* { - struct vnode *a_vp; - } */ *ap; +int +kernfs_print(v) + void *v; { printf("tag VT_KERNFS, kernfs vnode\n"); return (0); } -/*void*/ -kernfs_vfree(ap) - struct vop_vfree_args /* { - struct vnode *a_pvp; - ino_t a_ino; - int a_mode; - } */ *ap; -{ - - return (0); -} - -/* - * /dev/fd vnode unsupported operation - */ -kernfs_enotsupp() -{ - - return (EOPNOTSUPP); -} - -/* - * /dev/fd "should never get here" operation - */ -kernfs_badop() +int +kernfs_link(v) + void *v; { - - panic("kernfs: bad op"); - /* NOTREACHED */ + struct vop_link_args /* { + struct vnode *a_dvp; + struct vnode *a_vp; + struct componentname *a_cnp; + } */ *ap = v; + + VOP_ABORTOP(ap->a_dvp, ap->a_cnp); + vput(ap->a_dvp); + return (EROFS); } -/* - * kernfs vnode null operation - */ -kernfs_nullop() +int +kernfs_symlink(v) + void *v; { - - return (0); + struct vop_symlink_args /* { + struct vnode *a_dvp; + struct vnode **a_vpp; + struct componentname *a_cnp; + struct vattr *a_vap; + char *a_target; + } */ *ap = v; + + VOP_ABORTOP(ap->a_dvp, ap->a_cnp); + vput(ap->a_dvp); + return (EROFS); } - -#define kernfs_create ((int (*) __P((struct vop_create_args *)))kernfs_enotsupp) -#define kernfs_mknod ((int (*) __P((struct vop_mknod_args *)))kernfs_enotsupp) -#define kernfs_close ((int (*) __P((struct vop_close_args *)))nullop) -#define kernfs_ioctl ((int (*) __P((struct vop_ioctl_args *)))kernfs_enotsupp) -#define kernfs_select ((int (*) __P((struct vop_select_args *)))kernfs_enotsupp) -#define kernfs_mmap ((int (*) __P((struct vop_mmap_args *)))kernfs_enotsupp) -#define kernfs_fsync ((int (*) __P((struct vop_fsync_args *)))nullop) -#define kernfs_seek ((int (*) __P((struct vop_seek_args *)))nullop) -#define kernfs_remove ((int (*) __P((struct vop_remove_args *)))kernfs_enotsupp) -#define kernfs_link ((int (*) __P((struct vop_link_args *)))kernfs_enotsupp) -#define kernfs_rename ((int (*) __P((struct vop_rename_args *)))kernfs_enotsupp) -#define kernfs_mkdir ((int (*) __P((struct vop_mkdir_args *)))kernfs_enotsupp) -#define kernfs_rmdir ((int (*) __P((struct vop_rmdir_args *)))kernfs_enotsupp) -#define kernfs_symlink ((int (*) __P((struct vop_symlink_args *)))kernfs_enotsupp) -#define kernfs_readlink \ - ((int (*) __P((struct vop_readlink_args *)))kernfs_enotsupp) -#define kernfs_abortop ((int (*) __P((struct vop_abortop_args *)))nullop) -#define kernfs_lock ((int (*) __P((struct vop_lock_args *)))nullop) -#define kernfs_unlock ((int (*) __P((struct vop_unlock_args *)))nullop) -#define kernfs_bmap ((int (*) __P((struct vop_bmap_args *)))kernfs_badop) -#define kernfs_strategy ((int (*) __P((struct vop_strategy_args *)))kernfs_badop) -#define kernfs_islocked ((int (*) __P((struct vop_islocked_args *)))nullop) -#define kernfs_advlock ((int (*) __P((struct vop_advlock_args *)))kernfs_enotsupp) -#define kernfs_blkatoff \ - ((int (*) __P((struct vop_blkatoff_args *)))kernfs_enotsupp) -#define kernfs_valloc ((int(*) __P(( \ - struct vnode *pvp, \ - int mode, \ - struct ucred *cred, \ - struct vnode **vpp))) kernfs_enotsupp) -#define kernfs_truncate \ - ((int (*) __P((struct vop_truncate_args *)))kernfs_enotsupp) -#define kernfs_update ((int (*) __P((struct vop_update_args *)))kernfs_enotsupp) -#define kernfs_bwrite ((int (*) __P((struct vop_bwrite_args *)))kernfs_enotsupp) - -int (**kernfs_vnodeop_p)(); -struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, kernfs_lookup }, /* lookup */ - { &vop_create_desc, kernfs_create }, /* create */ - { &vop_mknod_desc, kernfs_mknod }, /* mknod */ - { &vop_open_desc, kernfs_open }, /* open */ - { &vop_close_desc, kernfs_close }, /* close */ - { &vop_access_desc, kernfs_access }, /* access */ - { &vop_getattr_desc, kernfs_getattr }, /* getattr */ - { &vop_setattr_desc, kernfs_setattr }, /* setattr */ - { &vop_read_desc, kernfs_read }, /* read */ - { &vop_write_desc, kernfs_write }, /* write */ - { &vop_ioctl_desc, kernfs_ioctl }, /* ioctl */ - { &vop_select_desc, kernfs_select }, /* select */ - { &vop_mmap_desc, kernfs_mmap }, /* mmap */ - { &vop_fsync_desc, kernfs_fsync }, /* fsync */ - { &vop_seek_desc, kernfs_seek }, /* seek */ - { &vop_remove_desc, kernfs_remove }, /* remove */ - { &vop_link_desc, kernfs_link }, /* link */ - { &vop_rename_desc, kernfs_rename }, /* rename */ - { &vop_mkdir_desc, kernfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, kernfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, kernfs_symlink }, /* symlink */ - { &vop_readdir_desc, kernfs_readdir }, /* readdir */ - { &vop_readlink_desc, kernfs_readlink },/* readlink */ - { &vop_abortop_desc, kernfs_abortop }, /* abortop */ - { &vop_inactive_desc, kernfs_inactive },/* inactive */ - { &vop_reclaim_desc, kernfs_reclaim }, /* reclaim */ - { &vop_lock_desc, kernfs_lock }, /* lock */ - { &vop_unlock_desc, kernfs_unlock }, /* unlock */ - { &vop_bmap_desc, kernfs_bmap }, /* bmap */ - { &vop_strategy_desc, kernfs_strategy },/* strategy */ - { &vop_print_desc, kernfs_print }, /* print */ - { &vop_islocked_desc, kernfs_islocked },/* islocked */ - { &vop_pathconf_desc, kernfs_pathconf },/* pathconf */ - { &vop_advlock_desc, kernfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, kernfs_blkatoff },/* blkatoff */ - { &vop_valloc_desc, kernfs_valloc }, /* valloc */ - { &vop_vfree_desc, kernfs_vfree }, /* vfree */ - { &vop_truncate_desc, kernfs_truncate },/* truncate */ - { &vop_update_desc, kernfs_update }, /* update */ - { &vop_bwrite_desc, kernfs_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } -}; -struct vnodeopv_desc kernfs_vnodeop_opv_desc = - { &kernfs_vnodeop_p, kernfs_vnodeop_entries };