Commit a80f36cc authored by David Kozub's avatar David Kozub Committed by Jens Axboe

block: sed-opal: rename next to execute_steps

As the function is responsible for executing the individual steps supplied
in the steps argument, execute_steps is a more descriptive name than the
rather generic next.
Signed-off-by: default avatarDavid Kozub <zub@linux.fjfi.cvut.cz>
Reviewed-by: default avatarScott Bauer <sbauer@plzdonthack.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0af2648e
...@@ -396,8 +396,8 @@ static int execute_step(struct opal_dev *dev, ...@@ -396,8 +396,8 @@ static int execute_step(struct opal_dev *dev,
return error; return error;
} }
static int next(struct opal_dev *dev, const struct opal_step *steps, static int execute_steps(struct opal_dev *dev,
size_t n_steps) const struct opal_step *steps, size_t n_steps)
{ {
size_t state = 0; size_t state = 0;
int error; int error;
...@@ -1937,7 +1937,7 @@ static int opal_secure_erase_locking_range(struct opal_dev *dev, ...@@ -1937,7 +1937,7 @@ static int opal_secure_erase_locking_range(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, erase_steps, ARRAY_SIZE(erase_steps)); ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -1954,7 +1954,7 @@ static int opal_erase_locking_range(struct opal_dev *dev, ...@@ -1954,7 +1954,7 @@ static int opal_erase_locking_range(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, erase_steps, ARRAY_SIZE(erase_steps)); ret = execute_steps(dev, erase_steps, ARRAY_SIZE(erase_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -1981,7 +1981,7 @@ static int opal_enable_disable_shadow_mbr(struct opal_dev *dev, ...@@ -1981,7 +1981,7 @@ static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2033,7 +2033,7 @@ static int opal_add_user_to_lr(struct opal_dev *dev, ...@@ -2033,7 +2033,7 @@ static int opal_add_user_to_lr(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, steps, ARRAY_SIZE(steps)); ret = execute_steps(dev, steps, ARRAY_SIZE(steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2048,7 +2048,7 @@ static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal) ...@@ -2048,7 +2048,7 @@ static int opal_reverttper(struct opal_dev *dev, struct opal_key *opal)
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, revert_steps, ARRAY_SIZE(revert_steps)); ret = execute_steps(dev, revert_steps, ARRAY_SIZE(revert_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
/* /*
...@@ -2076,10 +2076,11 @@ static int __opal_lock_unlock(struct opal_dev *dev, ...@@ -2076,10 +2076,11 @@ static int __opal_lock_unlock(struct opal_dev *dev,
}; };
if (lk_unlk->session.sum) if (lk_unlk->session.sum)
return next(dev, unlock_sum_steps, return execute_steps(dev, unlock_sum_steps,
ARRAY_SIZE(unlock_sum_steps)); ARRAY_SIZE(unlock_sum_steps));
else else
return next(dev, unlock_steps, ARRAY_SIZE(unlock_steps)); return execute_steps(dev, unlock_steps,
ARRAY_SIZE(unlock_steps));
} }
static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key) static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)
...@@ -2091,7 +2092,7 @@ static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key) ...@@ -2091,7 +2092,7 @@ static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)
{ end_opal_session, } { end_opal_session, }
}; };
return next(dev, mbrdone_step, ARRAY_SIZE(mbrdone_step)); return execute_steps(dev, mbrdone_step, ARRAY_SIZE(mbrdone_step));
} }
static int opal_lock_unlock(struct opal_dev *dev, static int opal_lock_unlock(struct opal_dev *dev,
...@@ -2126,7 +2127,7 @@ static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal) ...@@ -2126,7 +2127,7 @@ static int opal_take_ownership(struct opal_dev *dev, struct opal_key *opal)
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, owner_steps, ARRAY_SIZE(owner_steps)); ret = execute_steps(dev, owner_steps, ARRAY_SIZE(owner_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2147,7 +2148,7 @@ static int opal_activate_lsp(struct opal_dev *dev, ...@@ -2147,7 +2148,7 @@ static int opal_activate_lsp(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, active_steps, ARRAY_SIZE(active_steps)); ret = execute_steps(dev, active_steps, ARRAY_SIZE(active_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2164,7 +2165,7 @@ static int opal_setup_locking_range(struct opal_dev *dev, ...@@ -2164,7 +2165,7 @@ static int opal_setup_locking_range(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, lr_steps, ARRAY_SIZE(lr_steps)); ret = execute_steps(dev, lr_steps, ARRAY_SIZE(lr_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2186,7 +2187,7 @@ static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw) ...@@ -2186,7 +2187,7 @@ static int opal_set_new_pw(struct opal_dev *dev, struct opal_new_pw *opal_pw)
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, pw_steps, ARRAY_SIZE(pw_steps)); ret = execute_steps(dev, pw_steps, ARRAY_SIZE(pw_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
...@@ -2210,7 +2211,7 @@ static int opal_activate_user(struct opal_dev *dev, ...@@ -2210,7 +2211,7 @@ static int opal_activate_user(struct opal_dev *dev,
mutex_lock(&dev->dev_lock); mutex_lock(&dev->dev_lock);
setup_opal_dev(dev); setup_opal_dev(dev);
ret = next(dev, act_steps, ARRAY_SIZE(act_steps)); ret = execute_steps(dev, act_steps, ARRAY_SIZE(act_steps));
mutex_unlock(&dev->dev_lock); mutex_unlock(&dev->dev_lock);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment