These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / md / persistent-data / dm-space-map-common.c

diff --git a/kernel/drivers/md/persistent-data/dm-space-map-common.c b/kernel/drivers/md/persistent-data/dm-space-map-common.c
index aacbe70..306d2e4 100644 (file)
--- a/kernel/drivers/md/persistent-data/dm-space-map-common.c
+++ b/kernel/drivers/md/persistent-data/dm-space-map-common.c
@@ -259,9 +259,7 @@ int sm_ll_extend(struct ll_disk *ll, dm_block_t extra_blocks)
 
                idx.blocknr = cpu_to_le64(dm_block_location(b));
 
-               r = dm_tm_unlock(ll->tm, b);
-               if (r < 0)
-                       return r;
+               dm_tm_unlock(ll->tm, b);
 
                idx.nr_free = cpu_to_le32(ll->entries_per_block);
                idx.none_free_before = 0;
@@ -293,7 +291,9 @@ int sm_ll_lookup_bitmap(struct ll_disk *ll, dm_block_t b, uint32_t *result)
 
        *result = sm_lookup_bitmap(dm_bitmap_data(blk), b);
 
-       return dm_tm_unlock(ll->tm, blk);
+       dm_tm_unlock(ll->tm, blk);
+
+       return 0;
 }
 
 static int sm_ll_lookup_big_ref_count(struct ll_disk *ll, dm_block_t b,
@@ -373,9 +373,7 @@ int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
                        return r;
                }
 
-               r = dm_tm_unlock(ll->tm, blk);
-               if (r < 0)
-                       return r;
+               dm_tm_unlock(ll->tm, blk);
 
                *result = i * ll->entries_per_block + (dm_block_t) position;
                return 0;
@@ -429,9 +427,7 @@ static int sm_ll_mutate(struct ll_disk *ll, dm_block_t b,
        if (ref_count <= 2) {
                sm_set_bitmap(bm_le, bit, ref_count);
 
-               r = dm_tm_unlock(ll->tm, nb);
-               if (r < 0)
-                       return r;
+               dm_tm_unlock(ll->tm, nb);
 
                if (old > 2) {
                        r = dm_btree_remove(&ll->ref_count_info,
@@ -445,9 +441,7 @@ static int sm_ll_mutate(struct ll_disk *ll, dm_block_t b,
                __le32 le_rc = cpu_to_le32(ref_count);
 
                sm_set_bitmap(bm_le, bit, 3);
-               r = dm_tm_unlock(ll->tm, nb);
-               if (r < 0)
-                       return r;
+               dm_tm_unlock(ll->tm, nb);
 
                __dm_bless_for_disk(&le_rc);
                r = dm_btree_insert(&ll->ref_count_info, ll->ref_count_root,
@@ -556,7 +550,9 @@ static int metadata_ll_init_index(struct ll_disk *ll)
        memcpy(dm_block_data(b), &ll->mi_le, sizeof(ll->mi_le));
        ll->bitmap_root = dm_block_location(b);
 
-       return dm_tm_unlock(ll->tm, b);
+       dm_tm_unlock(ll->tm, b);
+
+       return 0;
 }
 
 static int metadata_ll_open(struct ll_disk *ll)
@@ -570,7 +566,9 @@ static int metadata_ll_open(struct ll_disk *ll)
                return r;
 
        memcpy(&ll->mi_le, dm_block_data(block), sizeof(ll->mi_le));
-       return dm_tm_unlock(ll->tm, block);
+       dm_tm_unlock(ll->tm, block);
+
+       return 0;
 }
 
 static dm_block_t metadata_ll_max_entries(struct ll_disk *ll)
@@ -590,7 +588,9 @@ static int metadata_ll_commit(struct ll_disk *ll)
        memcpy(dm_block_data(b), &ll->mi_le, sizeof(ll->mi_le));
        ll->bitmap_root = dm_block_location(b);
 
-       return dm_tm_unlock(ll->tm, b);
+       dm_tm_unlock(ll->tm, b);
+
+       return 0;
 }
 
 int sm_ll_new_metadata(struct ll_disk *ll, struct dm_transaction_manager *tm)