Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma...

[cascardo/linux.git] / fs / ceph / super.c

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 10a4ccb..06150fd 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1026,6 +1026,7 @@ static int __init init_ceph(void)
        if (ret)
                goto out;
 
+       ceph_flock_init();
        ceph_xattr_init();
        ret = register_filesystem(&ceph_fs_type);
        if (ret)