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 branch 'linus' into x86/urgent
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
md
/
persistent-data
/
dm-space-map-common.c
diff --git
a/drivers/md/persistent-data/dm-space-map-common.c
b/drivers/md/persistent-data/dm-space-map-common.c
index df2494c06cdc08acc566dcaef7e12f14689224ac..ff3beed6ad2d93769e475539ecd60d29ffdfaf22 100644
(file)
--- a/
drivers/md/persistent-data/dm-space-map-common.c
+++ b/
drivers/md/persistent-data/dm-space-map-common.c
@@
-405,8
+405,6
@@
int sm_ll_insert(struct ll_disk *ll, dm_block_t b,
if (r < 0)
return r;
-#if 0
- /* FIXME: dm_btree_remove doesn't handle this yet */
if (old > 2) {
r = dm_btree_remove(&ll->ref_count_info,
ll->ref_count_root,
@@
-414,7
+412,6
@@
int sm_ll_insert(struct ll_disk *ll, dm_block_t b,
if (r)
return r;
}
-#endif
} else {
__le32 le_rc = cpu_to_le32(ref_count);