* [Cluster-devel] [patch] GFS2: alloc_workqueue() doesn't return an ERR_PTR
@ 2013-08-15 7:54 Dan Carpenter
2013-08-15 9:49 ` Steven Whitehouse
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-08-15 7:54 UTC (permalink / raw)
To: cluster-devel.redhat.com
alloc_workqueue() returns a NULL on error, it doesn't return an ERR_PTR.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Cluster-devel] [patch] GFS2: alloc_workqueue() doesn't return an ERR_PTR
2013-08-15 7:54 [Cluster-devel] [patch] GFS2: alloc_workqueue() doesn't return an ERR_PTR Dan Carpenter
@ 2013-08-15 9:49 ` Steven Whitehouse
0 siblings, 0 replies; 2+ messages in thread
From: Steven Whitehouse @ 2013-08-15 9:49 UTC (permalink / raw)
To: cluster-devel.redhat.com
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@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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-15 9:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-15 7:54 [Cluster-devel] [patch] GFS2: alloc_workqueue() doesn't return an ERR_PTR Dan Carpenter
2013-08-15 9:49 ` Steven Whitehouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).