Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[karo-tx-linux.git] / fs / orangefs / orangefs-mod.c

diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index 4113eb0495bf90549daca478dd0f8c5a7940680a..c1b5174cb5a9fd5fa0963c22478f1457503e6657 100644 (file)
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -80,11 +80,6 @@ static int __init orangefs_init(void)
        int ret = -1;
        __u32 i = 0;
 
-       ret = bdi_init(&orangefs_backing_dev_info);
-
-       if (ret)
-               return ret;
-
        if (op_timeout_secs < 0)
                op_timeout_secs = 0;
 
@@ -94,7 +89,7 @@ static int __init orangefs_init(void)
        /* initialize global book keeping data structures */
        ret = op_cache_initialize();
        if (ret < 0)
-               goto err;
+               goto out;
 
        ret = orangefs_inode_cache_initialize();
        if (ret < 0)
@@ -181,9 +176,6 @@ cleanup_inode:
 cleanup_op:
        op_cache_finalize();
 
-err:
-       bdi_destroy(&orangefs_backing_dev_info);
-
 out:
        return ret;
 }
@@ -207,8 +199,6 @@ static void __exit orangefs_exit(void)
 
        kfree(orangefs_htable_ops_in_progress);
 
-       bdi_destroy(&orangefs_backing_dev_info);
-
        pr_info("orangefs: module version %s unloaded\n", ORANGEFS_VERSION);
 }