Merge tag 'metag-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[karo-tx-linux.git] / drivers / md / dm-era-target.c

diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c
index 0119ebfb3d49b4652bd71548af42037aac22953a..665bf32856182e73bb390e3446b8280982bae020 100644 (file)
--- a/drivers/md/dm-era-target.c
+++ b/drivers/md/dm-era-target.c
@@ -343,7 +343,9 @@ static int superblock_all_zeroes(struct dm_block_manager *bm, bool *result)
                }
        }
 
-       return dm_bm_unlock(b);
+       dm_bm_unlock(b);
+
+       return 0;
 }
 
 /*----------------------------------------------------------------*/
@@ -582,7 +584,9 @@ static int open_metadata(struct era_metadata *md)
        md->metadata_snap = le64_to_cpu(disk->metadata_snap);
        md->archived_writesets = true;
 
-       return dm_bm_unlock(sblock);
+       dm_bm_unlock(sblock);
+
+       return 0;
 
 bad:
        dm_bm_unlock(sblock);
@@ -1046,12 +1050,7 @@ static int metadata_take_snap(struct era_metadata *md)
 
        md->metadata_snap = dm_block_location(clone);
 
-       r = dm_tm_unlock(md->tm, clone);
-       if (r) {
-               DMERR("%s: couldn't unlock clone", __func__);
-               md->metadata_snap = SUPERBLOCK_LOCATION;
-               return r;
-       }
+       dm_tm_unlock(md->tm, clone);
 
        return 0;
 }