git: 26e72728ce12 - main - null_rename: some style
Konstantin Belousov
kib at FreeBSD.org
Tue Jul 27 16:59:02 UTC 2021
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=26e72728ce12c8670894435fcef8055a0ecb6266
commit 26e72728ce12c8670894435fcef8055a0ecb6266
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-07-24 14:46:51 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-07-27 16:58:47 +0000
null_rename: some style
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D31310
---
sys/fs/nullfs/null_vnops.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 43dc325a79f5..ce67d2760418 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
More information about the dev-commits-src-all
mailing list