3 files changed, 9 insertions, 8 deletions

diff --git a/lib/iommu-common.c b/lib/iommu-common.c
index ff19f66d3f7f..b1c93e94ca7a 100644
--- a/lib/iommu-common.c
+++ b/lib/iommu-common.c
@@ -21,8 +21,7 @@ static	DEFINE_PER_CPU(unsigned int, iommu_hash_common);
 
 static inline bool need_flush(struct iommu_map_table *iommu)
 {
-        return (iommu->lazy_flush != NULL &&
-                (iommu->flags & IOMMU_NEED_FLUSH) != 0);
+        return ((iommu->flags & IOMMU_NEED_FLUSH) != 0);
 }
 
 static inline void set_flush(struct iommu_map_table *iommu)
@@ -211,7 +210,8 @@ unsigned long iommu_tbl_range_alloc(struct device *dev,
                         goto bail;
                 }
         }
-        if (n < pool->hint || need_flush(iommu)) {
+        if (iommu->lazy_flush &&
+            (n < pool->hint || need_flush(iommu))) {
                 clear_flush(iommu);
                 iommu->lazy_flush(iommu);
         }
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index cc0c69710dcf..a54ff8949f91 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -187,10 +187,7 @@ static int rhashtable_rehash_one(struct rhashtable *ht, unsigned int old_hash)
         head = rht_dereference_bucket(new_tbl->buckets[new_hash],
                                       new_tbl, new_hash);
 
-        if (rht_is_a_nulls(head))
-                INIT_RHT_NULLS_HEAD(entry->next, ht, new_hash);
-        else
-                RCU_INIT_POINTER(entry->next, head);
+        RCU_INIT_POINTER(entry->next, head);
 
         rcu_assign_pointer(new_tbl->buckets[new_hash], entry);
         spin_unlock(new_bucket_lock);
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 54036ce2e2dd..5939f63d90cd 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -59,7 +59,11 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
         }
 
         exp = divisor[units] / (u32)blk_size;
-        if (size >= exp) {
+        /*
+         * size must be strictly greater than exp here to ensure that remainder
+         * is greater than divisor[units] coming out of the if below.
+         */
+        if (size > exp) {
                 remainder = do_div(size, divisor[units]);
                 remainder *= blk_size;
                 i++;