diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2021-07-24 14:46:51 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2021-08-03 09:52:36 +0000 |
| commit | 5c52335fd1ccdd640134fe7b3dec7e8755e8d42c (patch) | |
| tree | 0cfd8e9305f17ab7e84516c1f7ede270843ed713 | |
| parent | 2a56a5c2c21a7bf1fc321a60fffbd8d59970633b (diff) | |
| download | src-5c52335fd1ccdd640134fe7b3dec7e8755e8d42c.tar.gz src-5c52335fd1ccdd640134fe7b3dec7e8755e8d42c.zip | |
null_rename: some style
(cherry picked from commit 26e72728ce12c8670894435fcef8055a0ecb6266)
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index eed0d6c74138..3afdf049863f 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -655,15 +655,17 @@ null_remove(struct vop_remove_args *ap) static int null_rename(struct vop_rename_args *ap) { - struct vnode *tdvp = ap->a_tdvp; - struct vnode *fvp = ap->a_fvp; - struct vnode *fdvp = ap->a_fdvp; - struct vnode *tvp = ap->a_tvp; + struct vnode *fdvp, *fvp, *tdvp, *tvp; struct null_node *tnn; + tdvp = ap->a_tdvp; + fvp = ap->a_fvp; + fdvp = ap->a_fdvp; + tvp = ap->a_tvp; + /* Check for cross-device rename. */ if ((fvp->v_mount != tdvp->v_mount) || - (tvp && (fvp->v_mount != tvp->v_mount))) { + (tvp != NULL && fvp->v_mount != tvp->v_mount)) { if (tdvp == tvp) vrele(tdvp); else |