From: Vishal Verma <vishal.l.verma@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 4/5] util/json: consolidate check for the UTIL_JSON_MEDIA_ERRORS flag
Date: Mon, 1 Oct 2018 21:31:39 -0600 [thread overview]
Message-ID: <20181002033140.21295-4-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20181002033140.21295-1-vishal.l.verma@intel.com>
We don't need to check for the above flag for each badblock we're
iterating over. Remove the check in the respective loops, and return
early if it is not set.
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
util/json.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/util/json.c b/util/json.c
index 30b56c3..4dd5fc3 100644
--- a/util/json.c
+++ b/util/json.c
@@ -457,7 +457,8 @@ struct json_object *util_region_badblocks_to_json(struct ndctl_region *region,
jbbs = json_object_new_array();
if (!jbbs)
return NULL;
- }
+ } else
+ return NULL;
ndctl_region_badblock_foreach(region, bb) {
struct json_object *jdimms;
@@ -465,9 +466,6 @@ struct json_object *util_region_badblocks_to_json(struct ndctl_region *region,
bbs += bb->len;
- if (!(flags & UTIL_JSON_MEDIA_ERRORS))
- continue;
-
/* get start address of region */
addr = ndctl_region_get_resource(region);
if (addr == ULLONG_MAX)
@@ -527,7 +525,8 @@ static struct json_object *dev_badblocks_to_json(struct ndctl_region *region,
jbbs = json_object_new_array();
if (!jbbs)
return NULL;
- }
+ } else
+ return NULL;
ndctl_region_badblock_foreach(region, bb) {
unsigned long long bb_begin, bb_end, begin, end;
@@ -554,9 +553,6 @@ static struct json_object *dev_badblocks_to_json(struct ndctl_region *region,
bbs += len;
- if (!(flags & UTIL_JSON_MEDIA_ERRORS))
- continue;
-
jbb = json_object_new_object();
if (!jbb)
goto err_array;
--
2.17.1
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2018-10-02 3:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 3:31 [ndctl PATCH 1/5] ndctl, lib: refactor badblocks retrieval routines Vishal Verma
2018-10-02 3:31 ` [ndctl PATCH 2/5] ndctl, lib: add APIs for retrieving namespace badblocks Vishal Verma
2018-10-02 3:31 ` [ndctl PATCH 3/5] util/json: fix an error check for region resource Vishal Verma
2018-10-03 1:47 ` Dan Williams
2018-10-02 3:31 ` Vishal Verma [this message]
2018-10-03 1:52 ` [ndctl PATCH 4/5] util/json: consolidate check for the UTIL_JSON_MEDIA_ERRORS flag Dan Williams
2018-10-02 3:31 ` [ndctl PATCH 5/5] util/json: add a util_namespace_badblocks_to_json() helper Vishal Verma
2018-10-03 1:58 ` Dan Williams
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=20181002033140.21295-4-vishal.l.verma@intel.com \
--to=vishal.l.verma@intel.com \
--cc=linux-nvdimm@lists.01.org \
/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).