From 90a29d82443ed2d5d95e22a8c6ba3bab2e73229a Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@csail.mit.edu>
Date: Fri, 12 Aug 2011 00:39:54 -0400
Subject: [PATCH] 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>
---
 src/afs/FBSD/osi_misc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c
index 2ece43d5a..04fe165a8 100644
--- 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)
-- 
2.39.5