From: Jon Derrick <jonathan.derrick@intel.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Jon Derrick <jonathan.derrick@intel.com>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Scott Bauer <scott.bauer@intel.com>,
Rafael Antognolli <rafael.antognolli@intel.com>,
Jens Axboe <axboe@fb.com>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH 5/5] block/sed: Eliminate state variable
Date: Fri, 17 Feb 2017 15:56:18 -0700 [thread overview]
Message-ID: <1487372178-15715-6-git-send-email-jonathan.derrick@intel.com> (raw)
In-Reply-To: <1487372178-15715-1-git-send-email-jonathan.derrick@intel.com>
Now that the function data is embedded with the function, there is no
need to carry a device state variable.
Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
---
block/sed-opal.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/block/sed-opal.c b/block/sed-opal.c
index 9fc323c..791a40a 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -85,7 +85,6 @@ struct opal_dev {
sec_send_recv *send_recv;
opal_step *funcs;
- int state;
struct mutex dev_lock;
u16 comid;
u32 hsn;
@@ -377,17 +376,17 @@ static void check_geometry(struct opal_dev *dev, const void *data)
static int next(struct opal_dev *dev)
{
opal_step *func;
- int error = 0;
+ int state = 0, error = 0;
do {
- func = &dev->funcs[dev->state];
+ func = &dev->funcs[state];
if (!func->fn)
break;
error = func->fn(dev, func->data);
if (error) {
pr_err("Error on step function: %d with error %d: %s\n",
- dev->state, error,
+ state, error,
opal_error_to_human(error));
/* For each OPAL command we do a discovery0 then we
@@ -397,10 +396,10 @@ static int next(struct opal_dev *dev)
* session. Therefore we shouldn't attempt to terminate
* a session, as one has not yet been created.
*/
- if (dev->state > 1)
+ if (state > 1)
return end_opal_session_error(dev);
}
- dev->state++;
+ state++;
} while (!error);
return error;
@@ -1285,7 +1284,7 @@ static int start_generic_opal_session(struct opal_dev *dev,
return finalize_and_send(dev, start_opal_session_cont);
}
-static int start_anybodyASP_opal_session(struct opal_dev *dev)
+static int start_anybodyASP_opal_session(struct opal_dev *dev, void *data)
{
return start_generic_opal_session(dev, OPAL_ANYBODY_UID,
OPAL_ADMINSP_UID, NULL, 0);
@@ -1376,7 +1375,7 @@ static int start_auth_opal_session(struct opal_dev *dev, void *data)
return finalize_and_send(dev, start_opal_session_cont);
}
-static int revert_tper(struct opal_dev *dev)
+static int revert_tper(struct opal_dev *dev, void *data)
{
int err = 0;
@@ -1461,7 +1460,7 @@ static int erase_locking_range(struct opal_dev *dev, void *data)
static int set_mbr_done(struct opal_dev *dev, void *data)
{
- u8 mbr_done_tf = data;
+ u8 mbr_done_tf = *(u8 *)data;
int err = 0;
clear_opal_cmd(dev);
@@ -1493,7 +1492,7 @@ static int set_mbr_done(struct opal_dev *dev, void *data)
static int set_mbr_enable_disable(struct opal_dev *dev, void *data)
{
- u8 mbr_en_dis = data;
+ u8 mbr_en_dis = *(u8 *)data;
int err = 0;
clear_opal_cmd(dev);
@@ -1962,19 +1961,17 @@ static int end_opal_session(struct opal_dev *dev, void *data)
static int end_opal_session_error(struct opal_dev *dev)
{
- const opal_step error_end_session[] = {
+ opal_step error_end_session[] = {
{ end_opal_session, },
{ NULL, }
};
dev->funcs = error_end_session;
- dev->state = 0;
return next(dev);
}
static inline void setup_opal_dev(struct opal_dev *dev,
- const opal_step *funcs)
+ opal_step *funcs)
{
- dev->state = 0;
dev->funcs = funcs;
dev->tsn = 0;
dev->hsn = 0;
@@ -2320,7 +2317,6 @@ bool opal_unlock_from_suspend(struct opal_dev *dev)
setup_opal_dev(dev, NULL);
list_for_each_entry(suspend, &dev->unlk_lst, node) {
- dev->state = 0;
dev->tsn = 0;
dev->hsn = 0;
--
1.8.3.1
prev parent reply other threads:[~2017-02-17 22:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 22:56 [PATCH 0/5] OPAL patches cont'd Jon Derrick
2017-02-17 22:56 ` [PATCH 1/5] block/sed: Use ssize_t on atom parsers to return errors Jon Derrick
2017-02-17 22:56 ` [PATCH 2/5] block/sed: Add helper to qualify response tokens Jon Derrick
2017-02-17 22:56 ` [PATCH 3/5] block/sed: Check received header lengths Jon Derrick
2017-02-17 22:56 ` [PATCH 4/5] block/sed: embedded function data into the function sequence Jon Derrick
2017-02-17 22:56 ` Jon Derrick [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487372178-15715-6-git-send-email-jonathan.derrick@intel.com \
--to=jonathan.derrick@intel.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=rafael.antognolli@intel.com \
--cc=scott.bauer@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).