summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-05-15 01:36:59 +0200
committerDave Chinner <david@fromorbit.com>2014-05-15 01:36:59 +0200
commit232c2f5c65dd80055e7163a5c82e3816119330e6 (patch)
treee103eaf14b6c9d4b24f9a33a0d3d218b3a76bbac /fs/xfs/xfs_super.c
parentMerge branch 'xfs-unused-args-cleanup' into for-next (diff)
parentxfs: add filestream allocator tracepoints (diff)
downloadlinux-232c2f5c65dd80055e7163a5c82e3816119330e6.tar.xz
linux-232c2f5c65dd80055e7163a5c82e3816119330e6.zip
Merge branch 'xfs-filestreams-lookup' into for-next
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 6e6673543777..8f0333b3f7a0 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1749,13 +1749,9 @@ init_xfs_fs(void)
if (error)
goto out_destroy_wq;
- error = xfs_filestream_init();
- if (error)
- goto out_mru_cache_uninit;
-
error = xfs_buf_init();
if (error)
- goto out_filestream_uninit;
+ goto out_mru_cache_uninit;
error = xfs_init_procfs();
if (error)
@@ -1782,8 +1778,6 @@ init_xfs_fs(void)
xfs_cleanup_procfs();
out_buf_terminate:
xfs_buf_terminate();
- out_filestream_uninit:
- xfs_filestream_uninit();
out_mru_cache_uninit:
xfs_mru_cache_uninit();
out_destroy_wq:
@@ -1802,7 +1796,6 @@ exit_xfs_fs(void)
xfs_sysctl_unregister();
xfs_cleanup_procfs();
xfs_buf_terminate();
- xfs_filestream_uninit();
xfs_mru_cache_uninit();
xfs_destroy_workqueues();
xfs_destroy_zones();