From 27ae234c7f625b269201fe7cd67247e1b9bff1ef Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 12 Jul 2012 11:48:49 +0100 Subject: [PATCH 09/34] dm thin metadata: remove a pointless label from __commit_transaction Code tidy. Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer --- drivers/md/dm-thin-metadata.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) Index: linux-2.6/drivers/md/dm-thin-metadata.c =================================================================== --- linux-2.6.orig/drivers/md/dm-thin-metadata.c +++ linux-2.6/drivers/md/dm-thin-metadata.c @@ -609,27 +609,27 @@ static int __commit_transaction(struct d r = __write_changed_details(pmd); if (r < 0) - 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 = superblock_lock(pmd, &sblock); if (r) - goto out; + return r; disk_super = dm_block_data(sblock); disk_super->time = cpu_to_le32(pmd->time); @@ -648,10 +648,7 @@ static int __commit_transaction(struct d if (r < 0) goto out_locked; - r = dm_tm_commit(pmd->tm, sblock); - -out: - return r; + return dm_tm_commit(pmd->tm, sblock); out_locked: dm_bm_unlock(sblock);