36c36
< __FBSDID("$FreeBSD: head/sys/kern/vfs_cache.c 232420 2012-03-03 01:06:54Z rmacklem $");
---
> __FBSDID("$FreeBSD: head/sys/kern/vfs_cache.c 241896 2012-10-22 17:50:54Z kib $");
1072c1072
< int error, vfslocked;
---
> int error;
1090d1089
< vfslocked = VFS_LOCK_GIANT(rdir->v_mount);
1092,1093d1090
< VFS_UNLOCK_GIANT(vfslocked);
< vfslocked = VFS_LOCK_GIANT(cdir->v_mount);
1095d1091
< VFS_UNLOCK_GIANT(vfslocked);
1142c1138
< int error, vfslocked;
---
> int error;
1156d1151
< vfslocked = VFS_LOCK_GIANT(rdir->v_mount);
1158d1152
< VFS_UNLOCK_GIANT(vfslocked);
1211c1205
< int error, vfslocked;
---
> int error;
1220d1213
< vfslocked = VFS_LOCK_GIANT((*vp)->v_mount);
1222d1214
< VFS_UNLOCK_GIANT(vfslocked);
1237d1228
< vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
1239d1229
< VFS_UNLOCK_GIANT(vfslocked);
1246d1235
< vfslocked = VFS_LOCK_GIANT((*vp)->v_mount);
1250d1238
< VFS_UNLOCK_GIANT(vfslocked);
1263d1250
< vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
1265d1251
< VFS_UNLOCK_GIANT(vfslocked);
1285c1271
< int error, slash_prefixed, vfslocked;
---
> int error, slash_prefixed;
1306d1291
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1308d1292
< VFS_UNLOCK_GIANT(vfslocked);
1318d1301
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1320d1302
< VFS_UNLOCK_GIANT(vfslocked);
1329d1310
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1331d1311
< VFS_UNLOCK_GIANT(vfslocked);
1338d1317
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1340d1318
< VFS_UNLOCK_GIANT(vfslocked);
1352d1329
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1354d1330
< VFS_UNLOCK_GIANT(vfslocked);
1368d1343
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1370d1344
< VFS_UNLOCK_GIANT(vfslocked);
1380d1353
< vfslocked = VFS_LOCK_GIANT(vp->v_mount);
1382d1354
< VFS_UNLOCK_GIANT(vfslocked);
1444c1416
< int error, vfslocked;
---
> int error;
1446d1417
< VFS_ASSERT_GIANT(vp->v_mount);
1473c1444
< NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1,
---
> NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | AUDITVNODE1,
1480d1450
< vfslocked = NDHASGIANT(&nd);
1490d1459
< VFS_UNLOCK_GIANT(vfslocked);