| Message ID | 20230201-update_query-v1-1-4dd3de2d35c1@intel.com |
|---|---|
| State | Accepted |
| Commit | ac47ac6571403d1a72ae65d81b4669ea5f6d2e81 |
| Headers | show |
| Series | [ndctl] ndctl/cxl: Remove unnecessary null check | expand |
On 2/3/23 2:56 PM, Ira Weiny wrote: > cmd->query_cmd can never be null in cxl_cmd_alloc_send(). The only call chain > is: > > cxl_cmd_do_query(cmd); > cxl_cmd_validate(cmd, cmd_id); > cxl_cmd_alloc_send(cmd, cmd_id); > > And cxl_cmd_do_query() ensures it is non-null. In addition the local variable > query is already dereferenced by the time it is checked for null. > > Remove the unneeded null check. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > Minor fix I found while working on the kernel side query command. > --- > cxl/lib/libcxl.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c > index 4205a587d3bb..4859bd5e2fbb 100644 > --- a/cxl/lib/libcxl.c > +++ b/cxl/lib/libcxl.c > @@ -3091,9 +3091,6 @@ static int cxl_cmd_alloc_send(struct cxl_cmd *cmd, u32 cmd_id) > struct cxl_command_info *cinfo = &query->commands[cmd->query_idx]; > size_t size; > > - if (!query) > - return -EINVAL; > - > size = sizeof(struct cxl_send_command); > cmd->send_cmd = calloc(1, size); > if (!cmd->send_cmd) > > --- > base-commit: b73e4e0390aae822bc91b8bf72430e6f0e84d668 > change-id: 20230201-update_query-ad2845ba197a > > Best regards,
On Fri, 2023-02-03 at 13:56 -0800, Ira Weiny wrote: > cmd->query_cmd can never be null in cxl_cmd_alloc_send(). The only call chain > is: > > cxl_cmd_do_query(cmd); > cxl_cmd_validate(cmd, cmd_id); > cxl_cmd_alloc_send(cmd, cmd_id); > > And cxl_cmd_do_query() ensures it is non-null. In addition the local variable > query is already dereferenced by the time it is checked for null. > > Remove the unneeded null check. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > --- > Minor fix I found while working on the kernel side query command. > --- > cxl/lib/libcxl.c | 3 --- > 1 file changed, 3 deletions(-) > Makes sense, applied, thanks! > diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c > index 4205a587d3bb..4859bd5e2fbb 100644 > --- a/cxl/lib/libcxl.c > +++ b/cxl/lib/libcxl.c > @@ -3091,9 +3091,6 @@ static int cxl_cmd_alloc_send(struct cxl_cmd *cmd, u32 cmd_id) > struct cxl_command_info *cinfo = &query->commands[cmd->query_idx]; > size_t size; > > - if (!query) > - return -EINVAL; > - > size = sizeof(struct cxl_send_command); > cmd->send_cmd = calloc(1, size); > if (!cmd->send_cmd) > > --- > base-commit: b73e4e0390aae822bc91b8bf72430e6f0e84d668 > change-id: 20230201-update_query-ad2845ba197a > > Best regards,
diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c index 4205a587d3bb..4859bd5e2fbb 100644 --- a/cxl/lib/libcxl.c +++ b/cxl/lib/libcxl.c @@ -3091,9 +3091,6 @@ static int cxl_cmd_alloc_send(struct cxl_cmd *cmd, u32 cmd_id) struct cxl_command_info *cinfo = &query->commands[cmd->query_idx]; size_t size; - if (!query) - return -EINVAL; - size = sizeof(struct cxl_send_command); cmd->send_cmd = calloc(1, size); if (!cmd->send_cmd)
cmd->query_cmd can never be null in cxl_cmd_alloc_send(). The only call chain is: cxl_cmd_do_query(cmd); cxl_cmd_validate(cmd, cmd_id); cxl_cmd_alloc_send(cmd, cmd_id); And cxl_cmd_do_query() ensures it is non-null. In addition the local variable query is already dereferenced by the time it is checked for null. Remove the unneeded null check. Signed-off-by: Ira Weiny <ira.weiny@intel.com> --- Minor fix I found while working on the kernel side query command. --- cxl/lib/libcxl.c | 3 --- 1 file changed, 3 deletions(-) --- base-commit: b73e4e0390aae822bc91b8bf72430e6f0e84d668 change-id: 20230201-update_query-ad2845ba197a Best regards,