[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1330731460-24727-1-git-send-email-agraf@suse.de>
Date: Sat, 3 Mar 2012 00:37:40 +0100
From: Alexander Graf <agraf@...e.de>
To: linux-kernel@...r.kernel.org
Cc: Thomas Meyer <thomas@...3r.de>, Ian Kent <raven@...maw.net>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Jeff Mahoney <jeffm@...e.de>, Arnd Bergmann <arnd@...db.de>
Subject: [PATCH] autofs: fix compilation on hosts without CONFIG_COMPAT
When compiling 3.3-rc5 on arm, I get the following compilation error:
fs/autofs4/inode.c: In function 'autofs4_fill_super':
fs/autofs4/inode.c:228:2: error: implicit declaration of function 'is_compat_task' [-Werror=implicit-function-declaration]
which was introduced by commit a32744d4a. On platforms that don't define
CONFIG_COMPAT, using is_compat_task() is not necessarily defined. So
let's just not use it there.
Signed-off-by: Alexander Graf <agraf@...e.de>
---
Sorry if this was already fixed elsewhere - I couldn't find a patch for it, but
my LKML searching skills are slightly limited :)
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 85f1fcd..bab4c5a 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -385,7 +385,11 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
sbi->pipefd = pipefd;
sbi->pipe = pipe;
sbi->catatonic = 0;
+#ifdef CONFIG_COMPAT
sbi->compat_daemon = is_compat_task();
+#else
+ sbi->compat_daemon = 0;
+#endif
}
out:
mutex_unlock(&sbi->wq_mutex);
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 06858d9..1fc68e7 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -225,7 +225,11 @@ 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;
+#ifdef CONFIG_COMPAT
sbi->compat_daemon = is_compat_task();
+#else
+ sbi->compat_daemon = 0;
+#endif
mutex_init(&sbi->wq_mutex);
mutex_init(&sbi->pipe_mutex);
spin_lock_init(&sbi->fs_lock);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists