1 files changed, 5 insertions, 2 deletions

diff --git a/fs/xfs/xfs_bit.h b/fs/xfs/xfs_bit.h
index f1e3c907044d..e1649c0d3e02 100644
--- a/fs/xfs/xfs_bit.h
+++ b/fs/xfs/xfs_bit.h
@@ -66,8 +66,11 @@ static inline int xfs_lowbit64(__uint64_t v)
                 n = ffs(w);
         } else {        /* upper bits */
                 w = (__uint32_t)(v >> 32);
-                if (w && (n = ffs(w)))
-                n += 32;
+                if (w) {
+                        n = ffs(w);
+                        if (n)
+                                n += 32;
+                }
         }
         return n - 1;
 }