diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:36 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:36 -0400 |
commit | a20c6bec0b8ae775e2e8f350819cef98eea9a832 (patch) | |
tree | fd9b8278e6522b66c3b72ce308864d0f30884e67 /fs/nfs/direct.c | |
parent | e245d4250d0326cfcf7c816a2081b6ab2ea810be (diff) |
NFS: grab open context in direct read
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 481be7f7bdd3..8a8942326758 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -260,7 +260,7 @@ static void nfs_direct_read_release(void *calldata) | |||
260 | 260 | ||
261 | if (put_dreq(dreq)) | 261 | if (put_dreq(dreq)) |
262 | nfs_direct_complete(dreq); | 262 | nfs_direct_complete(dreq); |
263 | nfs_readdata_free(data); | 263 | nfs_readdata_release(data); |
264 | } | 264 | } |
265 | 265 | ||
266 | static const struct rpc_call_ops nfs_read_direct_ops = { | 266 | static const struct rpc_call_ops nfs_read_direct_ops = { |
@@ -337,7 +337,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, | |||
337 | data->inode = inode; | 337 | data->inode = inode; |
338 | data->cred = msg.rpc_cred; | 338 | data->cred = msg.rpc_cred; |
339 | data->args.fh = NFS_FH(inode); | 339 | data->args.fh = NFS_FH(inode); |
340 | data->args.context = ctx; | 340 | data->args.context = get_nfs_open_context(ctx); |
341 | data->args.lock_context = dreq->l_ctx; | 341 | data->args.lock_context = dreq->l_ctx; |
342 | data->args.offset = pos; | 342 | data->args.offset = pos; |
343 | data->args.pgbase = pgbase; | 343 | data->args.pgbase = pgbase; |