summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-07 21:08:07 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-07 21:08:07 +0100
commit4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543 (patch)
tree8774d2a82e5a3682e863eb9e1ae34fd7aed8ac94 /net
parentgigaset: fix Oops on module unload regression (diff)
parentNFS: Fix dentry revalidation for NFSv4 referrals and mountpoint crossings (diff)
downloadlinux-4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543.tar.xz
linux-4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543.zip
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix dentry revalidation for NFSv4 referrals and mountpoint crossings NFS: Fix the fsid revalidation in nfs_update_inode() SUNRPC: Fix a nfs4 over rdma transport oops NFS: Fix an f_mode/f_flags confusion in fs/nfs/write.c
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtrdma/transport.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 02c522c17de5..a564c1a39ec5 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -614,7 +614,11 @@ xprt_rdma_free(void *buffer)
return;
req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]);
- r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
+ if (req->rl_iov.length == 0) { /* see allocate above */
+ r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer,
+ struct rpcrdma_xprt, rx_buf);
+ } else
+ r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
rep = req->rl_reply;
dprintk("RPC: %s: called on 0x%p%s\n",