Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756477Ab2BYWKn (ORCPT ); Sat, 25 Feb 2012 17:10:43 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:54703 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752830Ab2BYWKm (ORCPT ); Sat, 25 Feb 2012 17:10:42 -0500 X-Auth-Info: rAecq1HDEfQzFiAkf9298QpEAoeaMf1GnK5P1Xdk06U= From: Andreas Schwab To: Ian Kent Cc: Linus Torvalds , David Miller , linux-kernel@vger.kernel.org, "H. Peter Anvin" , autofs@vger.kernel.org, Thomas Meyer , Al Viro Subject: [PATCH] autofs4: fix compilation without CONFIG_COMPAT References: <20120221.221609.218135609185671883.davem@davemloft.net> <1329889428.2193.45.camel@perseus.themaw.net> <1329890027.2193.48.camel@perseus.themaw.net> <1329890251.2193.50.camel@perseus.themaw.net> X-Yow: Where does it go when you flush? Date: Sat, 25 Feb 2012 23:10:35 +0100 In-Reply-To: <1329890251.2193.50.camel@perseus.themaw.net> (Ian Kent's message of "Wed, 22 Feb 2012 13:57:31 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2107 Lines: 66 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 --- 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." -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/