Commit 79955898 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

autofs4: fix kernel includes 



autofs_dev-ioctl.h is included by both the kernel module and user space tools
and it includes two kernel header files.  Compiles work if the kernel headers
are installed but fail otherwise.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8f63aaa8

include/linux/auto_dev-ioctl.h

+6 −1
Original line number Diff line number Diff line
@@ -10,8 +10,13 @@ 
#ifndef _LINUX_AUTO_DEV_IOCTL_H

#define _LINUX_AUTO_DEV_IOCTL_H



#include <linux/auto_fs.h>



#ifdef __KERNEL__

#include <linux/string.h>

#include <linux/types.h>

#else

#include <string.h>

#endif /* __KERNEL__ */



#define AUTOFS_DEVICE_NAME		"autofs"

include/linux/auto_fs.h

+4 −2
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
#ifdef __KERNEL__

#include <linux/fs.h>

#include <linux/limits.h>

#include <linux/types.h>

#include <linux/ioctl.h>

#else

#include <asm/types.h>

#include <sys/ioctl.h>

#endif /* __KERNEL__ */



#include <linux/ioctl.h>



/* This file describes autofs v3 */

#define AUTOFS_PROTO_VERSION	3

CRA Git | Maintained and supported by SUSTech CRA and CCSE