diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
| commit | 5acac83bf2e42f51ab9fd315d657798754bf0bb8 (patch) | |
| tree | 564be60664226649f00798cc3afb72d72d0ed24d /drivers/md/persistent-data/dm-btree-spine.c | |
| parent | Input: cyttsp - verbose error on soft reset (diff) | |
| parent | Linux 5.12-rc4 (diff) | |
| download | linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.tar.xz linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.zip | |
Merge tag 'v5.12-rc4' into next
Sync up with the mainline to bring in newest APIs.
Diffstat (limited to 'drivers/md/persistent-data/dm-btree-spine.c')
| -rw-r--r-- | drivers/md/persistent-data/dm-btree-spine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c index e03cb9e48773..8a2bfbfb218b 100644 --- a/drivers/md/persistent-data/dm-btree-spine.c +++ b/drivers/md/persistent-data/dm-btree-spine.c @@ -235,7 +235,7 @@ int shadow_has_parent(struct shadow_spine *s) return s->count >= 2; } -int shadow_root(struct shadow_spine *s) +dm_block_t shadow_root(struct shadow_spine *s) { return s->root; } |