git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
include
/
linux
/
sunrpc
/
clnt.h
diff --git
a/include/linux/sunrpc/clnt.h
b/include/linux/sunrpc/clnt.h
index
85f38a6
..
a5a55f2
100644
(file)
--- a/
include/linux/sunrpc/clnt.h
+++ b/
include/linux/sunrpc/clnt.h
@@
-102,6
+102,7
@@
struct rpc_procinfo {
#ifdef __KERNEL__
struct rpc_create_args {
#ifdef __KERNEL__
struct rpc_create_args {
+ struct net *net;
int protocol;
struct sockaddr *address;
size_t addrsize;
int protocol;
struct sockaddr *address;
size_t addrsize;
@@
-137,7
+138,6
@@
int rpcb_register(u32, u32, int, unsigned short);
int rpcb_v4_register(const u32 program, const u32 version,
const struct sockaddr *address,
const char *netid);
int rpcb_v4_register(const u32 program, const u32 version,
const struct sockaddr *address,
const char *netid);
-int rpcb_getport_sync(struct sockaddr_in *, u32, u32, int);
void rpcb_getport_async(struct rpc_task *);
void rpc_call_start(struct rpc_task *);
void rpcb_getport_async(struct rpc_task *);
void rpc_call_start(struct rpc_task *);