36c36
< __FBSDID("$FreeBSD: head/sys/kern/vfs_acl.c 225617 2011-09-16 13:58:51Z kmacy $");
---
> __FBSDID("$FreeBSD: head/sys/kern/vfs_acl.c 241896 2012-10-22 17:50:54Z kib $");
330c330
< int vfslocked, error;
---
> int error;
332c332
< NDINIT(&nd, LOOKUP, MPSAFE|FOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
334d333
< vfslocked = NDHASGIANT(&nd);
339d337
< VFS_UNLOCK_GIANT(vfslocked);
350c348
< int vfslocked, error;
---
> int error;
352c350
< NDINIT(&nd, LOOKUP, MPSAFE|NOFOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td);
354d351
< vfslocked = NDHASGIANT(&nd);
359d355
< VFS_UNLOCK_GIANT(vfslocked);
370c366
< int vfslocked, error;
---
> int error;
372c368
< NDINIT(&nd, LOOKUP, MPSAFE|FOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
374d369
< vfslocked = NDHASGIANT(&nd);
379d373
< VFS_UNLOCK_GIANT(vfslocked);
390c384
< int vfslocked, error;
---
> int error;
392c386
< NDINIT(&nd, LOOKUP, MPSAFE|NOFOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td);
394d387
< vfslocked = NDHASGIANT(&nd);
399d391
< VFS_UNLOCK_GIANT(vfslocked);
410c402
< int vfslocked, error;
---
> int error;
414d405
< vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
417d407
< VFS_UNLOCK_GIANT(vfslocked);
429c419
< int vfslocked, error;
---
> int error;
433d422
< vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
436d424
< VFS_UNLOCK_GIANT(vfslocked);
448c436
< int vfslocked, error;
---
> int error;
450c438
< NDINIT(&nd, LOOKUP, MPSAFE|FOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
452d439
< vfslocked = NDHASGIANT(&nd);
457d443
< VFS_UNLOCK_GIANT(vfslocked);
468c454
< int vfslocked, error;
---
> int error;
470c456
< NDINIT(&nd, LOOKUP, MPSAFE|NOFOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td);
472d457
< vfslocked = NDHASGIANT(&nd);
477d461
< VFS_UNLOCK_GIANT(vfslocked);
488c472
< int vfslocked, error;
---
> int error;
493d476
< vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
496d478
< VFS_UNLOCK_GIANT(vfslocked);
508c490
< int vfslocked, error;
---
> int error;
510c492
< NDINIT(&nd, LOOKUP, MPSAFE|FOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
512d493
< vfslocked = NDHASGIANT(&nd);
517d497
< VFS_UNLOCK_GIANT(vfslocked);
528c508
< int vfslocked, error;
---
> int error;
530c510
< NDINIT(&nd, LOOKUP, MPSAFE|NOFOLLOW, UIO_USERSPACE, uap->path, td);
---
> NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td);
532d511
< vfslocked = NDHASGIANT(&nd);
537d515
< VFS_UNLOCK_GIANT(vfslocked);
548c526
< int vfslocked, error;
---
> int error;
553d530
< vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
556d532
< VFS_UNLOCK_GIANT(vfslocked);