aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/dm-thin-metadata.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index c858931d2dcb..acd89ec825d5 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -597,31 +597,31 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)
597 597
598 r = __write_changed_details(pmd); 598 r = __write_changed_details(pmd);
599 if (r < 0) 599 if (r < 0)
600 goto out; 600 return r;
601 601
602 if (!pmd->need_commit) 602 if (!pmd->need_commit)
603 goto out; 603 return r;
604 604
605 r = dm_sm_commit(pmd->data_sm); 605 r = dm_sm_commit(pmd->data_sm);
606 if (r < 0) 606 if (r < 0)
607 goto out; 607 return r;
608 608
609 r = dm_tm_pre_commit(pmd->tm); 609 r = dm_tm_pre_commit(pmd->tm);
610 if (r < 0) 610 if (r < 0)
611 goto out; 611 return r;
612 612
613 r = dm_sm_root_size(pmd->metadata_sm, &metadata_len); 613 r = dm_sm_root_size(pmd->metadata_sm, &metadata_len);
614 if (r < 0) 614 if (r < 0)
615 goto out; 615 return r;
616 616
617 r = dm_sm_root_size(pmd->data_sm, &data_len); 617 r = dm_sm_root_size(pmd->data_sm, &data_len);
618 if (r < 0) 618 if (r < 0)
619 goto out; 619 return r;
620 620
621 r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION, 621 r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
622 &sb_validator, &sblock); 622 &sb_validator, &sblock);
623 if (r) 623 if (r)
624 goto out; 624 return r;
625 625
626 disk_super = dm_block_data(sblock); 626 disk_super = dm_block_data(sblock);
627 disk_super->time = cpu_to_le32(pmd->time); 627 disk_super->time = cpu_to_le32(pmd->time);
@@ -644,7 +644,6 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)
644 if (!r) 644 if (!r)
645 pmd->need_commit = 0; 645 pmd->need_commit = 0;
646 646
647out:
648 return r; 647 return r;
649 648
650out_locked: 649out_locked: