[Cluster-devel] [patch] GFS2: alloc_workqueue() doesn't return an ERR_PTR
Steven Whitehouse
swhiteho at redhat.com
Thu Aug 15 09:49:52 UTC 2013
Hi,
On Thu, 2013-08-15 at 10:54 +0300, Dan Carpenter wrote:
> alloc_workqueue() returns a NULL on error, it doesn't return an ERR_PTR.
>
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
>
Thanks, I've added this to the gfs2 git tree,
Steve.
> diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
> index a9d8caf..5433777 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -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);
More information about the Cluster-devel
mailing list