UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: lnet: avoid uninitialized return value 

gcc warns that the latest workqueue change leads to returning an
uninitialized variable:

drivers/staging/lustre/lnet/selftest/module.c: In function 'lnet_selftest_init':
drivers/staging/lustre/lnet/selftest/module.c:98:10: error: 'rc' may be used uninitialized in this function [-Werror=maybe-uninitialized]

A failure from alloc_ordered_workqueue() tends to indicate an
out-of-memory condition, so return -ENOMEM in both cases.
The second error path was a preexisting bug, where we always
returned zero after a kvmalloc_array() failure.

Fixes: 6106c0f824 ("staging: lustre: lnet: convert selftest to use workqueues")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2018-01-16 10:34:25 +01:00 committed by Greg Kroah-Hartman
parent 2b44667b8f
commit e3675875c0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/lustre/lnet/selftest/module.c
View File

@ -95,15 +95,17 @@ lnet_selftest_init(void)
lst_serial_wq = alloc_ordered_workqueue("lst_s", 0); lst_serial_wq = alloc_ordered_workqueue("lst_s", 0);
if (!lst_serial_wq) { if (!lst_serial_wq) {
CERROR("Failed to create serial WI scheduler for LST\n"); CERROR("Failed to create serial WI scheduler for LST\n");
return rc; return -ENOMEM;
} }
lst_init_step = LST_INIT_WI_SERIAL; lst_init_step = LST_INIT_WI_SERIAL;
nscheds = cfs_cpt_number(lnet_cpt_table()); nscheds = cfs_cpt_number(lnet_cpt_table());
lst_test_wq = kvmalloc_array(nscheds, sizeof(lst_test_wq[0]), lst_test_wq = kvmalloc_array(nscheds, sizeof(lst_test_wq[0]),
GFP_KERNEL | __GFP_ZERO); GFP_KERNEL | __GFP_ZERO);
if (!lst_test_wq) if (!lst_test_wq) {
rc = -ENOMEM;
goto error; goto error;
}
lst_init_step = LST_INIT_WI_TEST; lst_init_step = LST_INIT_WI_TEST;
for (i = 0; i < nscheds; i++) { for (i = 0; i < nscheds; i++) {
@ -116,6 +118,7 @@ lnet_selftest_init(void)
if (!lst_test_wq[i]) { if (!lst_test_wq[i]) {
CWARN("Failed to create CPU partition affinity WI scheduler %d for LST\n", CWARN("Failed to create CPU partition affinity WI scheduler %d for LST\n",
i); i);
rc = -ENOMEM;
goto error; goto error;
} }
attrs.nice = 0; attrs.nice = 0;