devlink: extract snapshot id allocation to helper function

A future change is going to implement a new devlink command to request
a snapshot on demand. As part of this, the logic for handling the
snapshot ids will be refactored. To simplify the snapshot id allocation
function, move it to a separate function prefixed by `__`. This helper
function will assume the lock is held.

While no other callers will exist, it simplifies refactoring the logic
because there is no need to complicate the function with gotos to handle
unlocking on failure.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 696660b97f89eb67ab80d83d735ac6cb29f8fce2..6f07fd7a67f2c73f172fd0ee1fa0d3dea41b1a4f 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -3768,6 +3768,19 @@ out_free_msg:
        nlmsg_free(msg);
 }
 
+/**
+ *     __devlink_region_snapshot_id_get - get snapshot ID
+ *     @devlink: devlink instance
+ *
+ *     Returns a new snapshot id. Must be called while holding the
+ *     devlink instance lock.
+ */
+static u32 __devlink_region_snapshot_id_get(struct devlink *devlink)
+{
+       lockdep_assert_held(&devlink->lock);
+       return ++devlink->snapshot_id;
+}
+
 /**
  *     __devlink_region_snapshot_create - create a new snapshot
  *     This will add a new snapshot of a region. The snapshot
@@ -7776,7 +7789,7 @@ u32 devlink_region_snapshot_id_get(struct devlink *devlink)
        u32 id;
 
        mutex_lock(&devlink->lock);
-       id = ++devlink->snapshot_id;
+       id = __devlink_region_snapshot_id_get(devlink);
        mutex_unlock(&devlink->lock);
 
        return id;