35c35
< __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clrpcops.c 222289 2011-05-25 20:53:08Z rmacklem $");
---
> __FBSDID("$FreeBSD: head/sys/fs/nfsclient/nfs_clrpcops.c 222719 2011-06-05 18:17:37Z rmacklem $");
3462c3462
< int reclaim, struct ucred *cred, NFSPROC_T *p)
---
> int reclaim, struct ucred *cred, NFSPROC_T *p, void *id, int flags)
3514c3514
< error = nfscl_lockt(vp, clp, off, len, fl, p);
---
> error = nfscl_lockt(vp, clp, off, len, fl, p, id, flags);
3518c3518
< p);
---
> p, id, flags);
3533c3533
< clp, &lp, &dorpc);
---
> clp, id, flags, &lp, &dorpc);
3541c3541
< nfscl_releasealllocks(clp, vp, p);
---
> nfscl_releasealllocks(clp, vp, p, id, flags);
3575c3575
< nfscl_releasealllocks(clp, vp, p);
---
> nfscl_releasealllocks(clp, vp, p, id, flags);
3578c3578
< NULL, 0, NULL, NULL, &lp, &newone, &donelocally);
---
> NULL, 0, id, flags, NULL, NULL, &lp, &newone, &donelocally);
3628c3628
< struct ucred *cred, NFSPROC_T *p)
---
> struct ucred *cred, NFSPROC_T *p, void *id, int flags)
3646c3646
< nfscl_filllockowner(p, own);
---
> nfscl_filllockowner(id, own, flags);