Commit d05a0201 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

sunrpc: remove __KERNEL__ ifdefs 



Remove the __KERNEL__ ifdefs from the non-UAPI sunrpc headers,
as those can't be included from user space programs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 581ae686

include/linux/sunrpc/auth.h

+0 −3
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#ifndef _LINUX_SUNRPC_AUTH_H

#define _LINUX_SUNRPC_AUTH_H



#ifdef __KERNEL__



#include <linux/sunrpc/sched.h>

#include <linux/sunrpc/msg_prot.h>

#include <linux/sunrpc/xdr.h>
@@ -194,5 +192,4 @@ struct rpc_cred *get_rpccred(struct rpc_cred *cred) 
	return NULL;

}



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_AUTH_H */

include/linux/sunrpc/auth_gss.h

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#ifndef _LINUX_SUNRPC_AUTH_GSS_H

#define _LINUX_SUNRPC_AUTH_GSS_H



#ifdef __KERNEL__

#include <linux/refcount.h>

#include <linux/sunrpc/auth.h>

#include <linux/sunrpc/svc.h>
@@ -90,6 +89,5 @@ struct gss_cred { 
	unsigned long		gc_upcall_timestamp;

};



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_AUTH_GSS_H */

include/linux/sunrpc/clnt.h

+0 −3
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ struct rpc_procinfo { 
	const char *		p_name;		/* name of procedure */

};



#ifdef __KERNEL__



struct rpc_create_args {

	struct net		*net;

	int			protocol;
@@ -237,5 +235,4 @@ static inline int rpc_reply_expected(struct rpc_task *task) 
		(task->tk_msg.rpc_proc->p_decode != NULL);

}



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_CLNT_H */

include/linux/sunrpc/gss_api.h

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#ifndef _LINUX_SUNRPC_GSS_API_H

#define _LINUX_SUNRPC_GSS_API_H



#ifdef __KERNEL__

#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/msg_prot.h>

#include <linux/uio.h>
@@ -160,6 +159,5 @@ struct gss_api_mech * gss_mech_get(struct gss_api_mech *); 
 * corresponding call to gss_mech_put. */

void gss_mech_put(struct gss_api_mech *);



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_GSS_API_H */

include/linux/sunrpc/gss_err.h

+0 −3
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#ifndef _LINUX_SUNRPC_GSS_ERR_H

#define _LINUX_SUNRPC_GSS_ERR_H



#ifdef __KERNEL__



typedef unsigned int OM_uint32;



/*
@@ -163,5 +161,4 @@ typedef unsigned int OM_uint32; 
/* XXXX This is a necessary evil until the spec is fixed */

#define GSS_S_CRED_UNAVAIL GSS_S_FAILURE



#endif /* __KERNEL__ */

#endif /* __LINUX_SUNRPC_GSS_ERR_H */