diff options
| author | Dave Chinner | 2014-06-10 07:32:56 +1000 |
|---|---|---|
| committer | Dave Chinner | 2014-06-10 07:32:56 +1000 |
| commit | 7691283d0561a350b7517be94818669fb5e3d910 (patch) | |
| tree | 3b939ee86e763c22c6ead988bf62de58e1981915 /fs/xfs/xfs_bit.h | |
| parent | 8612c7e594808e4a67bc2d4661f5925df2be3f51 (diff) | |
| parent | 30265117ee1e23fa91920f337a3ea91207f700dc (diff) | |
Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next
Diffstat (limited to 'fs/xfs/xfs_bit.h')
| -rw-r--r-- | fs/xfs/xfs_bit.h | 7 |
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; } |