[patch net-next] devlink: send notifications for deleted snapshots on region destroy

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

Currently the notifications for deleted snapshots are sent only in case
user deletes a snapshot manually. Send the notifications in case region
is destroyed too.

Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 net/core/devlink.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index aba2d45f9087..d33284ac3e7c 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -379,14 +379,6 @@ devlink_region_snapshot_get_by_id(struct devlink_region 
*region, u32 id)
        return NULL;
 }
 
-static void devlink_region_snapshot_del(struct devlink_snapshot *snapshot)
-{
-       snapshot->region->cur_snapshots--;
-       list_del(&snapshot->list);
-       (*snapshot->data_destructor)(snapshot->data);
-       kfree(snapshot);
-}
-
 #define DEVLINK_NL_FLAG_NEED_DEVLINK   BIT(0)
 #define DEVLINK_NL_FLAG_NEED_PORT      BIT(1)
 #define DEVLINK_NL_FLAG_NEED_SB                BIT(2)
@@ -3677,6 +3669,16 @@ static void devlink_nl_region_notify(struct 
devlink_region *region,
        nlmsg_free(msg);
 }
 
+static void devlink_region_snapshot_del(struct devlink_region *region,
+                                       struct devlink_snapshot *snapshot)
+{
+       devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_DEL);
+       region->cur_snapshots--;
+       list_del(&snapshot->list);
+       (*snapshot->data_destructor)(snapshot->data);
+       kfree(snapshot);
+}
+
 static int devlink_nl_cmd_region_get_doit(struct sk_buff *skb,
                                          struct genl_info *info)
 {
@@ -3772,8 +3774,7 @@ static int devlink_nl_cmd_region_del(struct sk_buff *skb,
        if (!snapshot)
                return -EINVAL;
 
-       devlink_nl_region_notify(region, snapshot, DEVLINK_CMD_REGION_DEL);
-       devlink_region_snapshot_del(snapshot);
+       devlink_region_snapshot_del(region, snapshot);
        return 0;
 }
 
@@ -6836,7 +6837,7 @@ void devlink_region_destroy(struct devlink_region *region)
 
        /* Free all snapshots of region */
        list_for_each_entry_safe(snapshot, ts, &region->snapshot_list, list)
-               devlink_region_snapshot_del(snapshot);
+               devlink_region_snapshot_del(region, snapshot);
 
        list_del(&region->list);
 
-- 
2.21.0