diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 03:54:43 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-08-19 04:33:43 -0400 |
commit | dfc4616ddeb133290599d4d13936e208f6ba8142 (patch) | |
tree | 7d71eff4c73f0439e96b114a229c7dc6e0ff941a /fs/gfs2/glock.c | |
parent | 1bc333f4cf601f77ba0f5046ff226fe654e83bee (diff) |
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 <dan.carpenter@oracle.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/glock.c')
-rw-r--r-- | fs/gfs2/glock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 9435384562a2..544a809819c3 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -1838,14 +1838,14 @@ int __init gfs2_glock_init(void) | |||
1838 | 1838 | ||
1839 | glock_workqueue = alloc_workqueue("glock_workqueue", WQ_MEM_RECLAIM | | 1839 | glock_workqueue = alloc_workqueue("glock_workqueue", WQ_MEM_RECLAIM | |
1840 | WQ_HIGHPRI | WQ_FREEZABLE, 0); | 1840 | WQ_HIGHPRI | WQ_FREEZABLE, 0); |
1841 | if (IS_ERR(glock_workqueue)) | 1841 | if (!glock_workqueue) |
1842 | return PTR_ERR(glock_workqueue); | 1842 | return -ENOMEM; |
1843 | gfs2_delete_workqueue = alloc_workqueue("delete_workqueue", | 1843 | gfs2_delete_workqueue = alloc_workqueue("delete_workqueue", |
1844 | WQ_MEM_RECLAIM | WQ_FREEZABLE, | 1844 | WQ_MEM_RECLAIM | WQ_FREEZABLE, |
1845 | 0); | 1845 | 0); |
1846 | if (IS_ERR(gfs2_delete_workqueue)) { | 1846 | if (!gfs2_delete_workqueue) { |
1847 | destroy_workqueue(glock_workqueue); | 1847 | destroy_workqueue(glock_workqueue); |
1848 | return PTR_ERR(gfs2_delete_workqueue); | 1848 | return -ENOMEM; |
1849 | } | 1849 | } |
1850 | 1850 | ||
1851 | register_shrinker(&glock_shrinker); | 1851 | register_shrinker(&glock_shrinker); |