projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
md
/
persistent-data
/
dm-transaction-manager.c
diff --git
a/drivers/md/persistent-data/dm-transaction-manager.c
b/drivers/md/persistent-data/dm-transaction-manager.c
index 81da1a26042e5fae05d136a01353c8f7ec923052..3bc30a0ae3d6084a2e08b356ac40c9082c6d5c62 100644
(file)
--- a/
drivers/md/persistent-data/dm-transaction-manager.c
+++ b/
drivers/md/persistent-data/dm-transaction-manager.c
@@
-154,7
+154,7
@@
int dm_tm_pre_commit(struct dm_transaction_manager *tm)
if (r < 0)
return r;
if (r < 0)
return r;
- return
0
;
+ return
dm_bm_flush(tm->bm)
;
}
EXPORT_SYMBOL_GPL(dm_tm_pre_commit);
}
EXPORT_SYMBOL_GPL(dm_tm_pre_commit);
@@
-164,8
+164,9
@@
int dm_tm_commit(struct dm_transaction_manager *tm, struct dm_block *root)
return -EWOULDBLOCK;
wipe_shadow_table(tm);
return -EWOULDBLOCK;
wipe_shadow_table(tm);
+ dm_bm_unlock(root);
- return dm_bm_flush
_and_unlock(tm->bm, root
);
+ return dm_bm_flush
(tm->bm
);
}
EXPORT_SYMBOL_GPL(dm_tm_commit);
}
EXPORT_SYMBOL_GPL(dm_tm_commit);