29c29
< __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clstate.c 222389 2011-05-27 22:05:10Z rmacklem $");
---
> __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clstate.c 222719 2011-06-05 18:17:37Z rmacklem $");
229c229
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(p->td_proc, own, F_POSIX);
524c524
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(p->td_proc, own, F_POSIX);
599c599
< nfscl_filllockowner(nproc, own);
---
> nfscl_filllockowner(nproc->td_proc, own, F_POSIX);
884c884
< int recovery, u_int8_t *rownp, u_int8_t *ropenownp,
---
> int recovery, void *id, int flags, u_int8_t *rownp, u_int8_t *ropenownp,
945c945
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);
1082c1082,1083
< struct nfsclclient *clp, struct nfscllockowner **lpp, int *dorpcp)
---
> struct nfsclclient *clp, void *id, int flags,
> struct nfscllockowner **lpp, int *dorpcp)
1119c1120
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);
1191c1192,1193
< nfscl_releasealllocks(struct nfsclclient *clp, vnode_t vp, NFSPROC_T *p)
---
> nfscl_releasealllocks(struct nfsclclient *clp, vnode_t vp, NFSPROC_T *p,
> void *id, int flags)
1200c1202
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);
1229c1231
< struct ucred *cred, NFSPROC_T *p)
---
> struct ucred *cred, NFSPROC_T *p, void *id, int flags)
1269c1271
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);
1644c1646
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(p->td_proc, own, F_POSIX);
3325c3327
< u_int64_t len, struct flock *fl, NFSPROC_T *p)
---
> u_int64_t len, struct flock *fl, NFSPROC_T *p, void *id, int flags)
3343c3345
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);
3618c3620
< clp, 1, lp->nfsl_owner, lp->nfsl_openowner, &nlp, &newone,
---
> clp, 1, NULL, 0, lp->nfsl_owner, lp->nfsl_openowner, &nlp, &newone,