diff options
author | Tejun Heo <tj@kernel.org> | 2011-02-01 05:42:42 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-02-01 05:42:42 -0500 |
commit | 316873c958eee302952edcadb8dc72d6d3d19d3c (patch) | |
tree | 9d9194ca6df360f6df1cfd6de13ab6e1e36d6501 /fs/ocfs2/super.c | |
parent | fd89d5f2030ac83324330bfd0bc73abf1beadaa6 (diff) |
ocfs2: use system_wq instead of ocfs2_quota_wq
ocfs2_quota_wq is not depended upon during memory reclaim and, with
cmwq, there's no reason to use a dedicated workqueue. Drop
ocfs2_quota_wq and use system_wq instead. dqi_sync_work is already
sync canceled on quota disable and no further synchronization is
necessary.
This change makes ocfs2_quota_setup/shutdown() noops. Both functions
removed.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 38f986d2447e..84a70113b43a 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1645,16 +1645,11 @@ static int __init ocfs2_init(void) | |||
1645 | mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n"); | 1645 | mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n"); |
1646 | } | 1646 | } |
1647 | 1647 | ||
1648 | status = ocfs2_quota_setup(); | ||
1649 | if (status) | ||
1650 | goto leave; | ||
1651 | |||
1652 | ocfs2_set_locking_protocol(); | 1648 | ocfs2_set_locking_protocol(); |
1653 | 1649 | ||
1654 | status = register_quota_format(&ocfs2_quota_format); | 1650 | status = register_quota_format(&ocfs2_quota_format); |
1655 | leave: | 1651 | leave: |
1656 | if (status < 0) { | 1652 | if (status < 0) { |
1657 | ocfs2_quota_shutdown(); | ||
1658 | ocfs2_free_mem_caches(); | 1653 | ocfs2_free_mem_caches(); |
1659 | exit_ocfs2_uptodate_cache(); | 1654 | exit_ocfs2_uptodate_cache(); |
1660 | } | 1655 | } |
@@ -1671,8 +1666,6 @@ static void __exit ocfs2_exit(void) | |||
1671 | { | 1666 | { |
1672 | mlog_entry_void(); | 1667 | mlog_entry_void(); |
1673 | 1668 | ||
1674 | ocfs2_quota_shutdown(); | ||
1675 | |||
1676 | if (ocfs2_wq) { | 1669 | if (ocfs2_wq) { |
1677 | flush_workqueue(ocfs2_wq); | 1670 | flush_workqueue(ocfs2_wq); |
1678 | destroy_workqueue(ocfs2_wq); | 1671 | destroy_workqueue(ocfs2_wq); |