]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
dax: make use of ->free_inode()
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 10 Apr 2019 18:57:19 +0000 (14:57 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 2 May 2019 02:43:26 +0000 (22:43 -0400)
we might want to drop ->destroy_inode() there - it's used only for
WARN_ON() now, and AFAICS that could be moved to ->evict_inode()
if we had one...

Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/dax/super.c

index 0a339b85133e1e2ea621dd24f6f42b637e6dac7e..bbd57ca0634a1314e79a4d762e1e1e68b99ff3d2 100644 (file)
@@ -412,11 +412,9 @@ static struct dax_device *to_dax_dev(struct inode *inode)
        return container_of(inode, struct dax_device, inode);
 }
 
-static void dax_i_callback(struct rcu_head *head)
+static void dax_free_inode(struct inode *inode)
 {
-       struct inode *inode = container_of(head, struct inode, i_rcu);
        struct dax_device *dax_dev = to_dax_dev(inode);
-
        kfree(dax_dev->host);
        dax_dev->host = NULL;
        if (inode->i_rdev)
@@ -427,16 +425,15 @@ static void dax_i_callback(struct rcu_head *head)
 static void dax_destroy_inode(struct inode *inode)
 {
        struct dax_device *dax_dev = to_dax_dev(inode);
-
        WARN_ONCE(test_bit(DAXDEV_ALIVE, &dax_dev->flags),
                        "kill_dax() must be called before final iput()\n");
-       call_rcu(&inode->i_rcu, dax_i_callback);
 }
 
 static const struct super_operations dax_sops = {
        .statfs = simple_statfs,
        .alloc_inode = dax_alloc_inode,
        .destroy_inode = dax_destroy_inode,
+       .free_inode = dax_free_inode,
        .drop_inode = generic_delete_inode,
 };