Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

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

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index ed1b65a6c2c3d050590b7c6c011cb027610e7e9b..ab4868c7308ecc9011fd76bf06307244658f2580 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -840,10 +840,10 @@ static int ceph_remount(struct super_block *sb, int *flags, char *data)
 
 static const struct super_operations ceph_super_ops = {
        .alloc_inode    = ceph_alloc_inode,
-       .destroy_inode  = ceph_destroy_inode,
        .free_inode     = ceph_free_inode,
        .write_inode    = ceph_write_inode,
-       .drop_inode     = ceph_drop_inode,
+       .drop_inode     = generic_delete_inode,
+       .evict_inode    = ceph_evict_inode,
        .sync_fs        = ceph_sync_fs,
        .put_super      = ceph_put_super,
        .remount_fs     = ceph_remount,
@@ -978,7 +978,7 @@ static int ceph_set_super(struct super_block *s, void *data)
        s->s_d_op = &ceph_dentry_ops;
        s->s_export_op = &ceph_export_ops;
 
-       s->s_time_gran = 1000;  /* 1000 ns == 1 us */
+       s->s_time_gran = 1;
 
        ret = set_anon_super(s, NULL);  /* what is that second arg for? */
        if (ret != 0)
@@ -1159,17 +1159,15 @@ static int __init init_ceph(void)
                goto out;
 
        ceph_flock_init();
-       ceph_xattr_init();
        ret = register_filesystem(&ceph_fs_type);
        if (ret)
-               goto out_xattr;
+               goto out_caches;
 
        pr_info("loaded (mds proto %d)\n", CEPH_MDSC_PROTOCOL);
 
        return 0;
 
-out_xattr:
-       ceph_xattr_exit();
+out_caches:
        destroy_caches();
 out:
        return ret;
@@ -1179,7 +1177,6 @@ static void __exit exit_ceph(void)
 {
        dout("exit_ceph\n");
        unregister_filesystem(&ceph_fs_type);
-       ceph_xattr_exit();
        destroy_caches();
 }