lkml.org 
[lkml]   [2019]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 52/62] ceph: use ->free_inode()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    a lot of non-delayed work in this case; all of that is left in
    ->destroy_inode()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/ceph/inode.c | 5 +----
    fs/ceph/super.c | 1 +
    fs/ceph/super.h | 1 +
    3 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
    index 2d61ddda9bf5..dc0a36d0adf8 100644
    --- a/fs/ceph/inode.c
    +++ b/fs/ceph/inode.c
    @@ -519,9 +519,8 @@ struct inode *ceph_alloc_inode(struct super_block *sb)
    return &ci->vfs_inode;
    }

    -static void ceph_i_callback(struct rcu_head *head)
    +void ceph_free_inode(struct inode *inode)
    {
    - struct inode *inode = container_of(head, struct inode, i_rcu);
    struct ceph_inode_info *ci = ceph_inode(inode);

    kfree(ci->i_symlink);
    @@ -581,8 +580,6 @@ void ceph_destroy_inode(struct inode *inode)
    ceph_buffer_put(ci->i_xattrs.prealloc_blob);

    ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));
    -
    - call_rcu(&inode->i_rcu, ceph_i_callback);
    }

    int ceph_drop_inode(struct inode *inode)
    diff --git a/fs/ceph/super.c b/fs/ceph/super.c
    index 6d5bb2f74612..285edda4fc3b 100644
    --- a/fs/ceph/super.c
    +++ b/fs/ceph/super.c
    @@ -848,6 +848,7 @@ static void ceph_umount_begin(struct super_block *sb)
    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,
    .sync_fs = ceph_sync_fs,
    diff --git a/fs/ceph/super.h b/fs/ceph/super.h
    index 16c03188578e..c5b4a05905c0 100644
    --- a/fs/ceph/super.h
    +++ b/fs/ceph/super.h
    @@ -874,6 +874,7 @@ extern const struct inode_operations ceph_file_iops;

    extern struct inode *ceph_alloc_inode(struct super_block *sb);
    extern void ceph_destroy_inode(struct inode *inode);
    +extern void ceph_free_inode(struct inode *inode);
    extern int ceph_drop_inode(struct inode *inode);

    extern struct inode *ceph_get_inode(struct super_block *sb,
    --
    2.11.0
    \
     
     \ /
      Last update: 2019-04-16 19:54    [W:4.207 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site