GFS2: alloc_workqueue() doesn't return an ERR_PTR
Subsystems (2)
PATCH 1/1 GFS2: alloc_workqueue() doesn't return an ERR_PTR
alloc_workqueue() returns a NULL on error, it doesn't return an ERR_PTR.
Signed-off-by Dan Carpenter <[email protected]>
fs/gfs2/glock.c +4 -4
@@ -1844,14 +1844,14 @@ int __init gfs2_glock_init(void) glock_workqueue =alloc_workqueue ("glock_workqueue" ,WQ_MEM_RECLAIM |WQ_HIGHPRI |WQ_FREEZABLE ,0 ); -if (IS_ERR (glock_workqueue)) -return PTR_ERR (glock_workqueue); +if (!glock_workqueue) +return -ENOMEM ; gfs2_delete_workqueue =alloc_workqueue ("delete_workqueue" ,WQ_MEM_RECLAIM |WQ_FREEZABLE ,0 ); -if (IS_ERR (gfs2_delete_workqueue)) { +if (!gfs2_delete_workqueue) {destroy_workqueue (glock_workqueue); -return PTR_ERR (gfs2_delete_workqueue); +return -ENOMEM ; }register_shrinker (&glock_shrinker);
PATCH 1/1 GFS2: alloc_workqueue() doesn't return an ERR_PTR
Hi,
Quoted 4 lines · Dan Carpenter
alloc_workqueue()returns a NULL on error, it doesn't return anERR_PTR.Signed-off-by Dan Carpenter <[email protected]>
Thanks, I've added this to the gfs2 git tree,
Steve.
Quoted 23 lines
fs/gfs2/glock.c +4
-4@@ -1844,14 +1844,14 @@ int __init gfs2_glock_init(void) glock_workqueue =alloc_workqueue ("glock_workqueue" ,WQ_MEM_RECLAIM |WQ_HIGHPRI |WQ_FREEZABLE ,0 ); -if (IS_ERR (glock_workqueue)) -return PTR_ERR (glock_workqueue); +if (!glock_workqueue) +return -ENOMEM ; gfs2_delete_workqueue =alloc_workqueue ("delete_workqueue" ,WQ_MEM_RECLAIM |WQ_FREEZABLE ,0 ); -if (IS_ERR (gfs2_delete_workqueue)) { +if (!gfs2_delete_workqueue) {destroy_workqueue (glock_workqueue); -return PTR_ERR (gfs2_delete_workqueue); +return -ENOMEM ; }register_shrinker (&glock_shrinker);