Some style for nullfs_mount(). Also use bool type for isvnunlocked.
Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week
This commit is contained in:
parent
95f237c2f6
commit
930cc2dbef
@ -74,13 +74,14 @@ static vfs_extattrctl_t nullfs_extattrctl;
|
||||
static int
|
||||
nullfs_mount(struct mount *mp)
|
||||
{
|
||||
int error = 0;
|
||||
struct vnode *lowerrootvp, *vp;
|
||||
struct vnode *nullm_rootvp;
|
||||
struct null_mount *xmp;
|
||||
struct null_node *nn;
|
||||
struct nameidata nd, *ndp;
|
||||
char *target;
|
||||
int isvnunlocked = 0, len;
|
||||
struct nameidata nd, *ndp = &nd;
|
||||
int error, len;
|
||||
bool isvnunlocked;
|
||||
|
||||
NULLFSDEBUG("nullfs_mount(mp = %p)\n", (void *)mp);
|
||||
|
||||
@ -110,14 +111,18 @@ nullfs_mount(struct mount *mp)
|
||||
/*
|
||||
* Unlock lower node to avoid possible deadlock.
|
||||
*/
|
||||
if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) &&
|
||||
if (mp->mnt_vnodecovered->v_op == &null_vnodeops &&
|
||||
VOP_ISLOCKED(mp->mnt_vnodecovered) == LK_EXCLUSIVE) {
|
||||
VOP_UNLOCK(mp->mnt_vnodecovered, 0);
|
||||
isvnunlocked = 1;
|
||||
isvnunlocked = true;
|
||||
} else {
|
||||
isvnunlocked = false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Find lower node
|
||||
*/
|
||||
ndp = &nd;
|
||||
NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, curthread);
|
||||
error = namei(ndp);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user