log: Allow nvme_msg usage with invalid root pointer#246
Merged
igaw merged 1 commit intolinux-nvme:masterfrom Feb 21, 2022
Merged
log: Allow nvme_msg usage with invalid root pointer#246igaw merged 1 commit intolinux-nvme:masterfrom
igaw merged 1 commit intolinux-nvme:masterfrom
Conversation
Contributor
martin-belanger
left a comment
martin-belanger
left a comment
There was a problem hiding this comment.
r also needs to be checked at lines 72-73
Collaborator
Author
|
This time even tested. Should work :) |
Contributor
There was a problem hiding this comment.
Shouldn't we test that the message is at the right level at the beginning of the function and return right away if we're not going to print it? This would avoid performing a whole lot of operations for nothing.
In other words:
/* Check if message is at the right level. If not, get out immediately */
if (r && lvl > r->log_level)
return;
Collaborator
Author
There was a problem hiding this comment.
Good point. I'll update it accordingly :)
24ac082 ("Add 'nvme_root_t' argument to nvme_msg()") and 19b1283 ("Move global logging variables into nvme_root_t") moved the logging controller knobs into the root object. In case the pointer is invalid we should not try to use it. Instead just bailing out just log the line. Signed-off-by: Daniel Wagner <dwagner@suse.de>
Collaborator
Author
|
I've also reformatted to code slightly, so it's easier to read (at least in my opinion :)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
24ac082 ("Add 'nvme_root_t' argument to nvme_msg()") and
19b1283 ("Move global logging variables into nvme_root_t") moved
the logging controller knobs into the root object. In case the pointer
is invalid we should not try to use it. Instead just bailing out just
log the line.
Signed-off-by: Daniel Wagner dwagner@suse.de
Fixes: #244