projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_bit.h
diff --git
a/fs/xfs/xfs_bit.h
b/fs/xfs/xfs_bit.h
index f1e3c907044db190f9dccd1f6dce7453f9932495..e1649c0d3e02f0f4da1ce1f8476008d53c7a8a3f 100644
(file)
--- 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;
}