FBSD: coalesce three assignments to the same variable

Found-by: clang static analyzer
Reviewed-on: http://gerrit.openafs.org/5233
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit e3148c6bfad25fdcb86b7248bd6b05432502d4ce)

Change-Id: I549bbeb4397d357257497179cd459f6034f93113
Reviewed-on: http://gerrit.openafs.org/8373
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c
index 2ece43d5a77bf836de883fa8004f2a66414644ea..04fe165a8fa50398ab6f2275c16609a5e32bf605 100644 (file)
--- a/src/afs/FBSD/osi_misc.c
+++ b/src/afs/FBSD/osi_misc.c
@@ -31,13 +31,11 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink,
     if (glocked)
        AFS_GUNLOCK();
 
-    flags = 0;
-    flags = LOCKLEAF;
+    flags = LOCKLEAF | MPSAFE; /* namei must take Giant if needed */
     if (followlink)
        flags |= FOLLOW;
     else
        flags |= NOFOLLOW;
-    flags |= MPSAFE; /* namei must take Giant if needed */
     NDINIT(&n, LOOKUP, flags, seg, aname, curthread);
     if ((error = namei(&n)) != 0) {
        if (glocked)