Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319456
b: refs/heads/master
c: d973ac1
h: refs/heads/master
v: v3
  • Loading branch information
Joe Thornber authored and Alasdair G Kergon committed Jul 27, 2012
1 parent 3c1b36b commit ccd4e58
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3caf6d73d4dc163b2d135e0b52b052a2b63e5216
refs/heads/master: d973ac196b7668c198f3c1338d8b07c13a3e7713
15 changes: 7 additions & 8 deletions trunk/drivers/md/dm-thin-metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,31 +597,31 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)

r = __write_changed_details(pmd);
if (r < 0)
goto out;
return r;

if (!pmd->need_commit)
goto out;
return r;

r = dm_sm_commit(pmd->data_sm);
if (r < 0)
goto out;
return r;

r = dm_tm_pre_commit(pmd->tm);
if (r < 0)
goto out;
return r;

r = dm_sm_root_size(pmd->metadata_sm, &metadata_len);
if (r < 0)
goto out;
return r;

r = dm_sm_root_size(pmd->data_sm, &data_len);
if (r < 0)
goto out;
return r;

r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
&sb_validator, &sblock);
if (r)
goto out;
return r;

disk_super = dm_block_data(sblock);
disk_super->time = cpu_to_le32(pmd->time);
Expand All @@ -644,7 +644,6 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)
if (!r)
pmd->need_commit = 0;

out:
return r;

out_locked:
Expand Down

0 comments on commit ccd4e58

Please sign in to comment.