summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-24 16:50:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-24 16:50:46 -0700
commit6c75969e22ffe27df64ff7477bd35fe72bface3e (patch)
treed5bcf7f6b7963e3c8848640bcd0fc6b850252fa8 /include
parentc02c873c25209f971c2e10884f50d4ab61db1e23 (diff)
parent556ae3bb32cabe483375b857dda1322384c57b65 (diff)
downloadlinux-6c75969e22ffe27df64ff7477bd35fe72bface3e.tar.gz
linux-6c75969e22ffe27df64ff7477bd35fe72bface3e.tar.bz2
linux-6c75969e22ffe27df64ff7477bd35fe72bface3e.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: don't try to decode GETATTR if DELEGRETURN returned error sunrpc: handle allocation errors from __rpc_lookup_create() SUNRPC: Fix the return value of rpc_run_bc_task() SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel SUNRPC: Fix a potential memory leak in auth_gss NFS: Prevent another deadlock in nfs_release_page()
Diffstat (limited to 'include')
-rw-r--r--include/linux/sunrpc/bc_xprt.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sunrpc/bc_xprt.h b/include/linux/sunrpc/bc_xprt.h
index d7152b451e21..7c91260c44a9 100644
--- a/include/linux/sunrpc/bc_xprt.h
+++ b/include/linux/sunrpc/bc_xprt.h
@@ -36,7 +36,6 @@ struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt);
void xprt_free_bc_request(struct rpc_rqst *req);
int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs);
void xprt_destroy_backchannel(struct rpc_xprt *, int max_reqs);
-void bc_release_request(struct rpc_task *);
int bc_send(struct rpc_rqst *req);
/*
@@ -59,6 +58,10 @@ static inline int svc_is_backchannel(const struct svc_rqst *rqstp)
{
return 0;
}
+
+static inline void xprt_free_bc_request(struct rpc_rqst *req)
+{
+}
#endif /* CONFIG_NFS_V4_1 */
#endif /* _LINUX_SUNRPC_BC_XPRT_H */