lkml.org 
[lkml]   [2012]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] autofs4: fix compilation without CONFIG_COMPAT
    Date
    The compat_daemon stuff is only needed on x86-64, and is_compat_task is
    only defined with CONFIG_COMPAT, so disable it for all other
    configurations.

    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    ---
    fs/autofs4/autofs_i.h | 2 ++
    fs/autofs4/dev-ioctl.c | 2 ++
    fs/autofs4/inode.c | 2 ++
    3 files changed, 6 insertions(+)

    diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
    index eb1cc92..60439c2 100644
    --- a/fs/autofs4/autofs_i.h
    +++ b/fs/autofs4/autofs_i.h
    @@ -110,7 +110,9 @@ struct autofs_sb_info {
    int sub_version;
    int min_proto;
    int max_proto;
    +#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
    int compat_daemon;
    +#endif
    unsigned long exp_timeout;
    unsigned int type;
    int reghost_enabled;
    diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
    index 85f1fcd..3ffff72 100644
    --- a/fs/autofs4/dev-ioctl.c
    +++ b/fs/autofs4/dev-ioctl.c
    @@ -385,7 +385,9 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
    sbi->pipefd = pipefd;
    sbi->pipe = pipe;
    sbi->catatonic = 0;
    +#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
    sbi->compat_daemon = is_compat_task();
    +#endif
    }
    out:
    mutex_unlock(&sbi->wq_mutex);
    diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
    index 06858d9..5f3fb68 100644
    --- a/fs/autofs4/inode.c
    +++ b/fs/autofs4/inode.c
    @@ -225,7 +225,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
    set_autofs_type_indirect(&sbi->type);
    sbi->min_proto = 0;
    sbi->max_proto = 0;
    +#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
    sbi->compat_daemon = is_compat_task();
    +#endif
    mutex_init(&sbi->wq_mutex);
    mutex_init(&sbi->pipe_mutex);
    spin_lock_init(&sbi->fs_lock);
    --
    1.7.9.2

    --
    Andreas Schwab, schwab@linux-m68k.org
    GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
    "And now for something completely different."


    \
     
     \ /
      Last update: 2012-02-25 23:13    [W:0.022 / U:300.492 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site