aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-10-24 13:42:08 +0200
committerGrant Likely <grant.likely@secretlab.ca>2011-10-24 13:42:08 +0200
commita853ba8d6d5d76bcbc5bf35b945b5727b5e5a36d (patch)
tree8faa7c17a8babd6b6fd63e13b85799a881e31956 /fs/xfs/xfs_super.c
parent5bdb7613414a9884166b2f5f20ad0353c1c6b6f3 (diff)
parentc3b92c8787367a8bb53d57d9789b558f1295cc96 (diff)
downloadlinux-a853ba8d6d5d76bcbc5bf35b945b5727b5e5a36d.tar.gz
Merge commit 'v3.1' into spi/next
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 2366c54cc4fa..5cf06b85fd9d 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1652,24 +1652,13 @@ xfs_init_workqueues(void)
*/
xfs_syncd_wq = alloc_workqueue("xfssyncd", WQ_CPU_INTENSIVE, 8);
if (!xfs_syncd_wq)
- goto out;
-
- xfs_ail_wq = alloc_workqueue("xfsail", WQ_CPU_INTENSIVE, 8);
- if (!xfs_ail_wq)
- goto out_destroy_syncd;
-
+ return -ENOMEM;
return 0;
-
-out_destroy_syncd:
- destroy_workqueue(xfs_syncd_wq);
-out:
- return -ENOMEM;
}
STATIC void
xfs_destroy_workqueues(void)
{
- destroy_workqueue(xfs_ail_wq);
destroy_workqueue(xfs_syncd_wq);
}