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 | |
| parent | e245d4250d0326cfcf7c816a2081b6ab2ea810be (diff) | |
| download | linux-a20c6bec0b8ae775e2e8f350819cef98eea9a832.tar.gz linux-a20c6bec0b8ae775e2e8f350819cef98eea9a832.tar.bz2 linux-a20c6bec0b8ae775e2e8f350819cef98eea9a832.zip | |
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')
| -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) if (put_dreq(dreq)) nfs_direct_complete(dreq); - nfs_readdata_free(data); + nfs_readdata_release(data); } 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, data->inode = inode; data->cred = msg.rpc_cred; data->args.fh = NFS_FH(inode); - data->args.context = ctx; + data->args.context = get_nfs_open_context(ctx); data->args.lock_context = dreq->l_ctx; data->args.offset = pos; data->args.pgbase = pgbase; |