* FAILED: patch "[PATCH] dm btree: add ref counting ops for the leaves of top level" failed to apply to 4.1-stable tree
@ 2015-08-19 16:15 gregkh
2015-08-19 16:33 ` Mike Snitzer
0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2015-08-19 16:15 UTC (permalink / raw)
To: ejt, snitzer; +Cc: stable
The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From b0dc3c8bc157c60b1d470163882be8c13e1950af Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Wed, 12 Aug 2015 15:12:09 +0100
Subject: [PATCH] dm btree: add ref counting ops for the leaves of top level
btrees
When using nested btrees, the top leaves of the top levels contain
block addresses for the root of the next tree down. If we shadow a
shared leaf node the leaf values (sub tree roots) should be incremented
accordingly.
This is only an issue if there is metadata sharing in the top levels.
Which only occurs if metadata snapshots are being used (as is possible
with dm-thinp). And could result in a block from the thinp metadata
snap being reused early, thus corrupting the thinp metadata snap.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
index bf2b80d5c470..8731b6ea026b 100644
--- a/drivers/md/persistent-data/dm-btree-internal.h
+++ b/drivers/md/persistent-data/dm-btree-internal.h
@@ -138,4 +138,10 @@ int lower_bound(struct btree_node *n, uint64_t key);
extern struct dm_block_validator btree_node_validator;
+/*
+ * Value type for upper levels of multi-level btrees.
+ */
+extern void init_le64_type(struct dm_transaction_manager *tm,
+ struct dm_btree_value_type *vt);
+
#endif /* DM_BTREE_INTERNAL_H */
diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
index 9ca9eccd512f..4222f774cf36 100644
--- a/drivers/md/persistent-data/dm-btree-remove.c
+++ b/drivers/md/persistent-data/dm-btree-remove.c
@@ -544,14 +544,6 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
return r;
}
-static struct dm_btree_value_type le64_type = {
- .context = NULL,
- .size = sizeof(__le64),
- .inc = NULL,
- .dec = NULL,
- .equal = NULL
-};
-
int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
uint64_t *keys, dm_block_t *new_root)
{
@@ -559,12 +551,14 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
int index = 0, r = 0;
struct shadow_spine spine;
struct btree_node *n;
+ struct dm_btree_value_type le64_vt;
+ init_le64_type(info->tm, &le64_vt);
init_shadow_spine(&spine, info);
for (level = 0; level < info->levels; level++) {
r = remove_raw(&spine, info,
(level == last_level ?
- &info->value_type : &le64_type),
+ &info->value_type : &le64_vt),
root, keys[level], (unsigned *)&index);
if (r < 0)
break;
@@ -654,11 +648,13 @@ static int remove_one(struct dm_btree_info *info, dm_block_t root,
int index = 0, r = 0;
struct shadow_spine spine;
struct btree_node *n;
+ struct dm_btree_value_type le64_vt;
uint64_t k;
+ init_le64_type(info->tm, &le64_vt);
init_shadow_spine(&spine, info);
for (level = 0; level < last_level; level++) {
- r = remove_raw(&spine, info, &le64_type,
+ r = remove_raw(&spine, info, &le64_vt,
root, keys[level], (unsigned *) &index);
if (r < 0)
goto out;
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
index 1b5e13ec7f96..0dee514ba4c5 100644
--- a/drivers/md/persistent-data/dm-btree-spine.c
+++ b/drivers/md/persistent-data/dm-btree-spine.c
@@ -249,3 +249,40 @@ int shadow_root(struct shadow_spine *s)
{
return s->root;
}
+
+static void le64_inc(void *context, const void *value_le)
+{
+ struct dm_transaction_manager *tm = context;
+ __le64 v_le;
+
+ memcpy(&v_le, value_le, sizeof(v_le));
+ dm_tm_inc(tm, le64_to_cpu(v_le));
+}
+
+static void le64_dec(void *context, const void *value_le)
+{
+ struct dm_transaction_manager *tm = context;
+ __le64 v_le;
+
+ memcpy(&v_le, value_le, sizeof(v_le));
+ dm_tm_dec(tm, le64_to_cpu(v_le));
+}
+
+static int le64_equal(void *context, const void *value1_le, const void *value2_le)
+{
+ __le64 v1_le, v2_le;
+
+ memcpy(&v1_le, value1_le, sizeof(v1_le));
+ memcpy(&v2_le, value2_le, sizeof(v2_le));
+ return v1_le == v2_le;
+}
+
+void init_le64_type(struct dm_transaction_manager *tm,
+ struct dm_btree_value_type *vt)
+{
+ vt->context = tm;
+ vt->size = sizeof(__le64);
+ vt->inc = le64_inc;
+ vt->dec = le64_dec;
+ vt->equal = le64_equal;
+}
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index fdd3793e22f9..c7726cebc495 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -667,12 +667,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
struct btree_node *n;
struct dm_btree_value_type le64_type;
- le64_type.context = NULL;
- le64_type.size = sizeof(__le64);
- le64_type.inc = NULL;
- le64_type.dec = NULL;
- le64_type.equal = NULL;
-
+ init_le64_type(info->tm, &le64_type);
init_shadow_spine(&spine, info);
for (level = 0; level < (info->levels - 1); level++) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] dm btree: add ref counting ops for the leaves of top level" failed to apply to 4.1-stable tree
2015-08-19 16:15 FAILED: patch "[PATCH] dm btree: add ref counting ops for the leaves of top level" failed to apply to 4.1-stable tree gregkh
@ 2015-08-19 16:33 ` Mike Snitzer
2015-08-19 16:42 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Mike Snitzer @ 2015-08-19 16:33 UTC (permalink / raw)
To: gregkh; +Cc: ejt, stable
On Wed, Aug 19 2015 at 12:15pm -0400,
gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> wrote:
>
> The patch below does not apply to the 4.1-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
I think it'd be sufficient to just remove the remove_one() hunk from
commit b0dc3c8bc1.
Otherwise, commit b0dc3c8bc1 depends on these commits to apply cleanly:
4ec331c3ea
aa0cd28d05
But I'll have to reassess the applicability of commit b0dc3c8bc1 to
earlier releases. I'll send a backport to stable@ if it is needed.
Thanks,
Mike
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] dm btree: add ref counting ops for the leaves of top level" failed to apply to 4.1-stable tree
2015-08-19 16:33 ` Mike Snitzer
@ 2015-08-19 16:42 ` Greg KH
2015-08-19 18:45 ` [PATCH] dm btree: add ref counting ops for the leaves of top level btrees Mike Snitzer
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2015-08-19 16:42 UTC (permalink / raw)
To: Mike Snitzer; +Cc: ejt, stable
On Wed, Aug 19, 2015 at 12:33:09PM -0400, Mike Snitzer wrote:
> On Wed, Aug 19 2015 at 12:15pm -0400,
> gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> wrote:
>
> >
> > The patch below does not apply to the 4.1-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
>
> I think it'd be sufficient to just remove the remove_one() hunk from
> commit b0dc3c8bc1.
>
> Otherwise, commit b0dc3c8bc1 depends on these commits to apply cleanly:
> 4ec331c3ea
> aa0cd28d05
>
> But I'll have to reassess the applicability of commit b0dc3c8bc1 to
> earlier releases. I'll send a backport to stable@ if it is needed.
Please send any changes you want, I'm not going to hand-edit patches on
my own, sorry.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] dm btree: add ref counting ops for the leaves of top level btrees
2015-08-19 16:42 ` Greg KH
@ 2015-08-19 18:45 ` Mike Snitzer
2015-08-31 10:57 ` Luis Henriques
0 siblings, 1 reply; 6+ messages in thread
From: Mike Snitzer @ 2015-08-19 18:45 UTC (permalink / raw)
To: Greg KH; +Cc: ejt, stable, dm-devel
This stable@ backport drops the dm-btree-remove.c:remove_one() hunk
from the original commit because it isn't relevant for stable.
Upstream linux.git commit b0dc3c8bc157c60b1d470163882be8c13e1950af
Author: Joe Thornber <ejt@redhat.com>
Date: Wed Aug 12 15:12:09 2015 +0100
dm btree: add ref counting ops for the leaves of top level btrees
When using nested btrees, the top leaves of the top levels contain
block addresses for the root of the next tree down. If we shadow a
shared leaf node the leaf values (sub tree roots) should be incremented
accordingly.
This is only an issue if there is metadata sharing in the top levels.
Which only occurs if metadata snapshots are being used (as is possible
with dm-thinp). And could result in a block from the thinp metadata
snap being reused early, thus corrupting the thinp metadata snap.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
---
drivers/md/persistent-data/dm-btree-internal.h | 6 +++++
drivers/md/persistent-data/dm-btree-remove.c | 12 +++------
drivers/md/persistent-data/dm-btree-spine.c | 37 ++++++++++++++++++++++++++
drivers/md/persistent-data/dm-btree.c | 7 +----
4 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
index bf2b80d..8731b6e 100644
--- a/drivers/md/persistent-data/dm-btree-internal.h
+++ b/drivers/md/persistent-data/dm-btree-internal.h
@@ -138,4 +138,10 @@ int lower_bound(struct btree_node *n, uint64_t key);
extern struct dm_block_validator btree_node_validator;
+/*
+ * Value type for upper levels of multi-level btrees.
+ */
+extern void init_le64_type(struct dm_transaction_manager *tm,
+ struct dm_btree_value_type *vt);
+
#endif /* DM_BTREE_INTERNAL_H */
diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
index b88757c..ff96197 100644
--- a/drivers/md/persistent-data/dm-btree-remove.c
+++ b/drivers/md/persistent-data/dm-btree-remove.c
@@ -544,14 +544,6 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
return r;
}
-static struct dm_btree_value_type le64_type = {
- .context = NULL,
- .size = sizeof(__le64),
- .inc = NULL,
- .dec = NULL,
- .equal = NULL
-};
-
int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
uint64_t *keys, dm_block_t *new_root)
{
@@ -559,12 +551,14 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
int index = 0, r = 0;
struct shadow_spine spine;
struct btree_node *n;
+ struct dm_btree_value_type le64_vt;
+ init_le64_type(info->tm, &le64_vt);
init_shadow_spine(&spine, info);
for (level = 0; level < info->levels; level++) {
r = remove_raw(&spine, info,
(level == last_level ?
- &info->value_type : &le64_type),
+ &info->value_type : &le64_vt),
root, keys[level], (unsigned *)&index);
if (r < 0)
break;
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
index 1b5e13e..0dee514 100644
--- a/drivers/md/persistent-data/dm-btree-spine.c
+++ b/drivers/md/persistent-data/dm-btree-spine.c
@@ -249,3 +249,40 @@ int shadow_root(struct shadow_spine *s)
{
return s->root;
}
+
+static void le64_inc(void *context, const void *value_le)
+{
+ struct dm_transaction_manager *tm = context;
+ __le64 v_le;
+
+ memcpy(&v_le, value_le, sizeof(v_le));
+ dm_tm_inc(tm, le64_to_cpu(v_le));
+}
+
+static void le64_dec(void *context, const void *value_le)
+{
+ struct dm_transaction_manager *tm = context;
+ __le64 v_le;
+
+ memcpy(&v_le, value_le, sizeof(v_le));
+ dm_tm_dec(tm, le64_to_cpu(v_le));
+}
+
+static int le64_equal(void *context, const void *value1_le, const void *value2_le)
+{
+ __le64 v1_le, v2_le;
+
+ memcpy(&v1_le, value1_le, sizeof(v1_le));
+ memcpy(&v2_le, value2_le, sizeof(v2_le));
+ return v1_le == v2_le;
+}
+
+void init_le64_type(struct dm_transaction_manager *tm,
+ struct dm_btree_value_type *vt)
+{
+ vt->context = tm;
+ vt->size = sizeof(__le64);
+ vt->inc = le64_inc;
+ vt->dec = le64_dec;
+ vt->equal = le64_equal;
+}
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index 200ac12..41e1ab2 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -667,12 +667,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
struct btree_node *n;
struct dm_btree_value_type le64_type;
- le64_type.context = NULL;
- le64_type.size = sizeof(__le64);
- le64_type.inc = NULL;
- le64_type.dec = NULL;
- le64_type.equal = NULL;
-
+ init_le64_type(info->tm, &le64_type);
init_shadow_spine(&spine, info);
for (level = 0; level < (info->levels - 1); level++) {
--
2.3.2 (Apple Git-55)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] dm btree: add ref counting ops for the leaves of top level btrees
2015-08-19 18:45 ` [PATCH] dm btree: add ref counting ops for the leaves of top level btrees Mike Snitzer
@ 2015-08-31 10:57 ` Luis Henriques
0 siblings, 0 replies; 6+ messages in thread
From: Luis Henriques @ 2015-08-31 10:57 UTC (permalink / raw)
To: Mike Snitzer; +Cc: Greg KH, ejt, stable, dm-devel
On Wed, Aug 19, 2015 at 02:45:43PM -0400, Mike Snitzer wrote:
> This stable@ backport drops the dm-btree-remove.c:remove_one() hunk
> from the original commit because it isn't relevant for stable.
>
Thanks, I guess this is applicable to the 3.16 kernel as well, so I'll
use a similar backport.
Cheers,
--
Lu�s
> Upstream linux.git commit b0dc3c8bc157c60b1d470163882be8c13e1950af
> Author: Joe Thornber <ejt@redhat.com>
> Date: Wed Aug 12 15:12:09 2015 +0100
>
> dm btree: add ref counting ops for the leaves of top level btrees
>
> When using nested btrees, the top leaves of the top levels contain
> block addresses for the root of the next tree down. If we shadow a
> shared leaf node the leaf values (sub tree roots) should be incremented
> accordingly.
>
> This is only an issue if there is metadata sharing in the top levels.
> Which only occurs if metadata snapshots are being used (as is possible
> with dm-thinp). And could result in a block from the thinp metadata
> snap being reused early, thus corrupting the thinp metadata snap.
>
> Signed-off-by: Joe Thornber <ejt@redhat.com>
> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/md/persistent-data/dm-btree-internal.h | 6 +++++
> drivers/md/persistent-data/dm-btree-remove.c | 12 +++------
> drivers/md/persistent-data/dm-btree-spine.c | 37 ++++++++++++++++++++++++++
> drivers/md/persistent-data/dm-btree.c | 7 +----
> 4 files changed, 47 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
> index bf2b80d..8731b6e 100644
> --- a/drivers/md/persistent-data/dm-btree-internal.h
> +++ b/drivers/md/persistent-data/dm-btree-internal.h
> @@ -138,4 +138,10 @@ int lower_bound(struct btree_node *n, uint64_t key);
>
> extern struct dm_block_validator btree_node_validator;
>
> +/*
> + * Value type for upper levels of multi-level btrees.
> + */
> +extern void init_le64_type(struct dm_transaction_manager *tm,
> + struct dm_btree_value_type *vt);
> +
> #endif /* DM_BTREE_INTERNAL_H */
> diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
> index b88757c..ff96197 100644
> --- a/drivers/md/persistent-data/dm-btree-remove.c
> +++ b/drivers/md/persistent-data/dm-btree-remove.c
> @@ -544,14 +544,6 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
> return r;
> }
>
> -static struct dm_btree_value_type le64_type = {
> - .context = NULL,
> - .size = sizeof(__le64),
> - .inc = NULL,
> - .dec = NULL,
> - .equal = NULL
> -};
> -
> int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
> uint64_t *keys, dm_block_t *new_root)
> {
> @@ -559,12 +551,14 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
> int index = 0, r = 0;
> struct shadow_spine spine;
> struct btree_node *n;
> + struct dm_btree_value_type le64_vt;
>
> + init_le64_type(info->tm, &le64_vt);
> init_shadow_spine(&spine, info);
> for (level = 0; level < info->levels; level++) {
> r = remove_raw(&spine, info,
> (level == last_level ?
> - &info->value_type : &le64_type),
> + &info->value_type : &le64_vt),
> root, keys[level], (unsigned *)&index);
> if (r < 0)
> break;
> diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
> index 1b5e13e..0dee514 100644
> --- a/drivers/md/persistent-data/dm-btree-spine.c
> +++ b/drivers/md/persistent-data/dm-btree-spine.c
> @@ -249,3 +249,40 @@ int shadow_root(struct shadow_spine *s)
> {
> return s->root;
> }
> +
> +static void le64_inc(void *context, const void *value_le)
> +{
> + struct dm_transaction_manager *tm = context;
> + __le64 v_le;
> +
> + memcpy(&v_le, value_le, sizeof(v_le));
> + dm_tm_inc(tm, le64_to_cpu(v_le));
> +}
> +
> +static void le64_dec(void *context, const void *value_le)
> +{
> + struct dm_transaction_manager *tm = context;
> + __le64 v_le;
> +
> + memcpy(&v_le, value_le, sizeof(v_le));
> + dm_tm_dec(tm, le64_to_cpu(v_le));
> +}
> +
> +static int le64_equal(void *context, const void *value1_le, const void *value2_le)
> +{
> + __le64 v1_le, v2_le;
> +
> + memcpy(&v1_le, value1_le, sizeof(v1_le));
> + memcpy(&v2_le, value2_le, sizeof(v2_le));
> + return v1_le == v2_le;
> +}
> +
> +void init_le64_type(struct dm_transaction_manager *tm,
> + struct dm_btree_value_type *vt)
> +{
> + vt->context = tm;
> + vt->size = sizeof(__le64);
> + vt->inc = le64_inc;
> + vt->dec = le64_dec;
> + vt->equal = le64_equal;
> +}
> diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
> index 200ac12..41e1ab2 100644
> --- a/drivers/md/persistent-data/dm-btree.c
> +++ b/drivers/md/persistent-data/dm-btree.c
> @@ -667,12 +667,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
> struct btree_node *n;
> struct dm_btree_value_type le64_type;
>
> - le64_type.context = NULL;
> - le64_type.size = sizeof(__le64);
> - le64_type.inc = NULL;
> - le64_type.dec = NULL;
> - le64_type.equal = NULL;
> -
> + init_le64_type(info->tm, &le64_type);
> init_shadow_spine(&spine, info);
>
> for (level = 0; level < (info->levels - 1); level++) {
> --
> 2.3.2 (Apple Git-55)
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dm btree: add ref counting ops for the leaves of top level btrees
@ 2015-08-31 10:57 ` Luis Henriques
0 siblings, 0 replies; 6+ messages in thread
From: Luis Henriques @ 2015-08-31 10:57 UTC (permalink / raw)
To: Mike Snitzer; +Cc: Greg KH, ejt, stable, dm-devel
On Wed, Aug 19, 2015 at 02:45:43PM -0400, Mike Snitzer wrote:
> This stable@ backport drops the dm-btree-remove.c:remove_one() hunk
> from the original commit because it isn't relevant for stable.
>
Thanks, I guess this is applicable to the 3.16 kernel as well, so I'll
use a similar backport.
Cheers,
--
Luís
> Upstream linux.git commit b0dc3c8bc157c60b1d470163882be8c13e1950af
> Author: Joe Thornber <ejt@redhat.com>
> Date: Wed Aug 12 15:12:09 2015 +0100
>
> dm btree: add ref counting ops for the leaves of top level btrees
>
> When using nested btrees, the top leaves of the top levels contain
> block addresses for the root of the next tree down. If we shadow a
> shared leaf node the leaf values (sub tree roots) should be incremented
> accordingly.
>
> This is only an issue if there is metadata sharing in the top levels.
> Which only occurs if metadata snapshots are being used (as is possible
> with dm-thinp). And could result in a block from the thinp metadata
> snap being reused early, thus corrupting the thinp metadata snap.
>
> Signed-off-by: Joe Thornber <ejt@redhat.com>
> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/md/persistent-data/dm-btree-internal.h | 6 +++++
> drivers/md/persistent-data/dm-btree-remove.c | 12 +++------
> drivers/md/persistent-data/dm-btree-spine.c | 37 ++++++++++++++++++++++++++
> drivers/md/persistent-data/dm-btree.c | 7 +----
> 4 files changed, 47 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
> index bf2b80d..8731b6e 100644
> --- a/drivers/md/persistent-data/dm-btree-internal.h
> +++ b/drivers/md/persistent-data/dm-btree-internal.h
> @@ -138,4 +138,10 @@ int lower_bound(struct btree_node *n, uint64_t key);
>
> extern struct dm_block_validator btree_node_validator;
>
> +/*
> + * Value type for upper levels of multi-level btrees.
> + */
> +extern void init_le64_type(struct dm_transaction_manager *tm,
> + struct dm_btree_value_type *vt);
> +
> #endif /* DM_BTREE_INTERNAL_H */
> diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
> index b88757c..ff96197 100644
> --- a/drivers/md/persistent-data/dm-btree-remove.c
> +++ b/drivers/md/persistent-data/dm-btree-remove.c
> @@ -544,14 +544,6 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
> return r;
> }
>
> -static struct dm_btree_value_type le64_type = {
> - .context = NULL,
> - .size = sizeof(__le64),
> - .inc = NULL,
> - .dec = NULL,
> - .equal = NULL
> -};
> -
> int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
> uint64_t *keys, dm_block_t *new_root)
> {
> @@ -559,12 +551,14 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
> int index = 0, r = 0;
> struct shadow_spine spine;
> struct btree_node *n;
> + struct dm_btree_value_type le64_vt;
>
> + init_le64_type(info->tm, &le64_vt);
> init_shadow_spine(&spine, info);
> for (level = 0; level < info->levels; level++) {
> r = remove_raw(&spine, info,
> (level == last_level ?
> - &info->value_type : &le64_type),
> + &info->value_type : &le64_vt),
> root, keys[level], (unsigned *)&index);
> if (r < 0)
> break;
> diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
> index 1b5e13e..0dee514 100644
> --- a/drivers/md/persistent-data/dm-btree-spine.c
> +++ b/drivers/md/persistent-data/dm-btree-spine.c
> @@ -249,3 +249,40 @@ int shadow_root(struct shadow_spine *s)
> {
> return s->root;
> }
> +
> +static void le64_inc(void *context, const void *value_le)
> +{
> + struct dm_transaction_manager *tm = context;
> + __le64 v_le;
> +
> + memcpy(&v_le, value_le, sizeof(v_le));
> + dm_tm_inc(tm, le64_to_cpu(v_le));
> +}
> +
> +static void le64_dec(void *context, const void *value_le)
> +{
> + struct dm_transaction_manager *tm = context;
> + __le64 v_le;
> +
> + memcpy(&v_le, value_le, sizeof(v_le));
> + dm_tm_dec(tm, le64_to_cpu(v_le));
> +}
> +
> +static int le64_equal(void *context, const void *value1_le, const void *value2_le)
> +{
> + __le64 v1_le, v2_le;
> +
> + memcpy(&v1_le, value1_le, sizeof(v1_le));
> + memcpy(&v2_le, value2_le, sizeof(v2_le));
> + return v1_le == v2_le;
> +}
> +
> +void init_le64_type(struct dm_transaction_manager *tm,
> + struct dm_btree_value_type *vt)
> +{
> + vt->context = tm;
> + vt->size = sizeof(__le64);
> + vt->inc = le64_inc;
> + vt->dec = le64_dec;
> + vt->equal = le64_equal;
> +}
> diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
> index 200ac12..41e1ab2 100644
> --- a/drivers/md/persistent-data/dm-btree.c
> +++ b/drivers/md/persistent-data/dm-btree.c
> @@ -667,12 +667,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
> struct btree_node *n;
> struct dm_btree_value_type le64_type;
>
> - le64_type.context = NULL;
> - le64_type.size = sizeof(__le64);
> - le64_type.inc = NULL;
> - le64_type.dec = NULL;
> - le64_type.equal = NULL;
> -
> + init_le64_type(info->tm, &le64_type);
> init_shadow_spine(&spine, info);
>
> for (level = 0; level < (info->levels - 1); level++) {
> --
> 2.3.2 (Apple Git-55)
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-31 10:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-19 16:15 FAILED: patch "[PATCH] dm btree: add ref counting ops for the leaves of top level" failed to apply to 4.1-stable tree gregkh
2015-08-19 16:33 ` Mike Snitzer
2015-08-19 16:42 ` Greg KH
2015-08-19 18:45 ` [PATCH] dm btree: add ref counting ops for the leaves of top level btrees Mike Snitzer
2015-08-31 10:57 ` Luis Henriques
2015-08-31 10:57 ` Luis Henriques
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.