35c35
< __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clport.c 222718 2011-06-05 17:31:44Z rmacklem $");
---
> __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clport.c 222719 2011-06-05 18:17:37Z rmacklem $");
503c503
< nfscl_filllockowner(struct thread *td, u_int8_t *cp)
---
> nfscl_filllockowner(void *id, u_int8_t *cp, int flags)
511,514c511,536
< if (td == NULL) {
< printf("NULL td\n");
< bzero(cp, 12);
< return;
---
> if (id == NULL) {
> printf("NULL id\n");
> bzero(cp, NFSV4CL_LOCKNAMELEN);
> return;
> }
> if ((flags & F_POSIX) != 0) {
> p = (struct proc *)id;
> tl.lval = p->p_pid;
> *cp++ = tl.cval[0];
> *cp++ = tl.cval[1];
> *cp++ = tl.cval[2];
> *cp++ = tl.cval[3];
> tl.lval = p->p_stats->p_start.tv_sec;
> *cp++ = tl.cval[0];
> *cp++ = tl.cval[1];
> *cp++ = tl.cval[2];
> *cp++ = tl.cval[3];
> tl.lval = p->p_stats->p_start.tv_usec;
> *cp++ = tl.cval[0];
> *cp++ = tl.cval[1];
> *cp++ = tl.cval[2];
> *cp = tl.cval[3];
> } else {
> printf("nfscl_filllockowner: not F_POSIX\n");
> bzero(cp, NFSV4CL_LOCKNAMELEN);
> }
516,542d537
< p = td->td_proc;
< if (p == NULL) {
< printf("NULL pid\n");
< bzero(cp, 12);
< return;
< }
< tl.lval = p->p_pid;
< *cp++ = tl.cval[0];
< *cp++ = tl.cval[1];
< *cp++ = tl.cval[2];
< *cp++ = tl.cval[3];
< if (p->p_stats == NULL) {
< printf("pstats null\n");
< bzero(cp, 8);
< return;
< }
< tl.lval = p->p_stats->p_start.tv_sec;
< *cp++ = tl.cval[0];
< *cp++ = tl.cval[1];
< *cp++ = tl.cval[2];
< *cp++ = tl.cval[3];
< tl.lval = p->p_stats->p_start.tv_usec;
< *cp++ = tl.cval[0];
< *cp++ = tl.cval[1];
< *cp++ = tl.cval[2];
< *cp = tl.cval[3];
< }