lkml.org 
[lkml]   [2010]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/17] autofs4: cleanup inode operations
    Date
    From: Ian Kent <raven@themaw.net>

    Since the use of ->follow_link() has been eliminated there is no
    need to separate the indirect and direct inode operations.

    Signed-off-by: Ian Kent <raven@themaw.net>
    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/autofs4/autofs_i.h | 3 ---
    fs/autofs4/inode.c | 4 +---
    fs/autofs4/root.c | 15 ---------------
    3 files changed, 1 insertions(+), 21 deletions(-)

    diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
    index cb86036..8710878 100644
    --- a/fs/autofs4/autofs_i.h
    +++ b/fs/autofs4/autofs_i.h
    @@ -201,9 +201,6 @@ void autofs_dev_ioctl_exit(void);

    extern const struct inode_operations autofs4_symlink_inode_operations;
    extern const struct inode_operations autofs4_dir_inode_operations;
    -extern const struct inode_operations autofs4_root_inode_operations;
    -extern const struct inode_operations autofs4_indirect_root_inode_operations;
    -extern const struct inode_operations autofs4_direct_root_inode_operations;
    extern const struct file_operations autofs4_dir_operations;
    extern const struct file_operations autofs4_root_operations;

    diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
    index c6e75b3..80cdffd 100644
    --- a/fs/autofs4/inode.c
    +++ b/fs/autofs4/inode.c
    @@ -326,9 +326,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
    __managed_dentry_set_managed(root);

    root_inode->i_fop = &autofs4_root_operations;
    - root_inode->i_op = autofs_type_trigger(sbi->type) ?
    - &autofs4_direct_root_inode_operations :
    - &autofs4_indirect_root_inode_operations;
    + root_inode->i_op = &autofs4_dir_inode_operations;

    /* Couldn't this be tested earlier? */
    if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||
    diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
    index 77257dd..2856a0c 100644
    --- a/fs/autofs4/root.c
    +++ b/fs/autofs4/root.c
    @@ -52,21 +52,6 @@ const struct file_operations autofs4_dir_operations = {
    .llseek = dcache_dir_lseek,
    };

    -const struct inode_operations autofs4_indirect_root_inode_operations = {
    - .lookup = autofs4_lookup,
    - .unlink = autofs4_dir_unlink,
    - .symlink = autofs4_dir_symlink,
    - .mkdir = autofs4_dir_mkdir,
    - .rmdir = autofs4_dir_rmdir,
    -};
    -
    -const struct inode_operations autofs4_direct_root_inode_operations = {
    - .lookup = autofs4_lookup,
    - .unlink = autofs4_dir_unlink,
    - .mkdir = autofs4_dir_mkdir,
    - .rmdir = autofs4_dir_rmdir,
    -};
    -
    const struct inode_operations autofs4_dir_inode_operations = {
    .lookup = autofs4_lookup,
    .unlink = autofs4_dir_unlink,


    \
     
     \ /
      Last update: 2010-10-03 23:01    [W:0.025 / U:2.432 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site