From: Andreas Schwab <schwab@linux-m68k.org>
To: Ian Kent <raven@themaw.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
David Miller <davem@davemloft.net>,
linux-kernel@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
autofs@vger.kernel.org, Thomas Meyer <thomas@m3y3r.de>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH] autofs4: fix compilation without CONFIG_COMPAT
Date: Sat, 25 Feb 2012 23:10:35 +0100 [thread overview]
Message-ID: <m2vcmuh8dg.fsf_-_@igel.home> (raw)
In-Reply-To: <1329890251.2193.50.camel@perseus.themaw.net> (Ian Kent's message of "Wed, 22 Feb 2012 13:57:31 +0800")
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."
next prev parent reply other threads:[~2012-02-25 22:10 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 2:24 compat: autofs v5 packet size ambiguity - update Linus Torvalds
2012-02-22 3:16 ` David Miller
2012-02-22 3:33 ` Linus Torvalds
2012-02-22 3:47 ` Linus Torvalds
2012-02-22 4:20 ` Ian Kent
2012-02-22 4:56 ` Linus Torvalds
2012-02-22 5:43 ` Ian Kent
2012-02-22 5:53 ` Ian Kent
2012-02-22 5:57 ` Ian Kent
2012-02-22 9:32 ` Ian Kent
2012-02-22 12:15 ` Ian Kent
2012-02-22 12:39 ` Ian Kent
2012-02-22 12:45 ` Ian Kent
2012-02-22 16:20 ` Linus Torvalds
2012-02-22 15:13 ` H. Peter Anvin
2012-02-23 1:35 ` Ian Kent
2012-02-22 16:12 ` Linus Torvalds
2012-02-23 1:48 ` Ian Kent
2012-02-23 1:54 ` Ian Kent
2012-02-23 2:21 ` Ian Kent
2012-02-23 6:29 ` Ian Kent
2012-02-23 6:31 ` H. Peter Anvin
2012-02-23 11:20 ` Ian Kent
2012-02-23 11:26 ` Ian Kent
2012-02-23 8:54 ` Thomas Meyer
2012-02-23 1:56 ` Linus Torvalds
2012-02-23 2:09 ` Ian Kent
2012-02-23 2:11 ` Ian Kent
2012-02-23 2:25 ` Linus Torvalds
2012-02-23 2:32 ` Ian Kent
2012-02-25 11:28 ` Thomas Meyer
2012-02-25 22:10 ` Andreas Schwab [this message]
2012-02-26 1:31 ` [PATCH] autofs4: fix compilation without CONFIG_COMPAT Linus Torvalds
2012-02-26 1:46 ` H. Peter Anvin
2012-02-26 1:53 ` Linus Torvalds
2012-02-26 3:07 ` H. Peter Anvin
2012-02-26 9:05 ` Andreas Schwab
2012-02-27 7:29 ` Christian Borntraeger
2012-02-27 9:09 ` Heiko Carstens
2012-02-27 16:22 ` H. Peter Anvin
2012-02-27 16:25 ` Linus Torvalds
2012-02-27 9:20 ` Ian Kent
2012-02-22 6:02 ` compat: autofs v5 packet size ambiguity - update H. Peter Anvin
2012-02-22 16:10 ` Linus Torvalds
2012-02-22 17:43 ` H. Peter Anvin
2012-02-22 17:45 ` H. Peter Anvin
2012-02-22 18:16 ` Linus Torvalds
2012-02-22 18:19 ` Linus Torvalds
2012-02-22 18:20 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2vcmuh8dg.fsf_-_@igel.home \
--to=schwab@linux-m68k.org \
--cc=autofs@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=raven@themaw.net \
--cc=thomas@m3y3r.de \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).