diff options
| author | Andy Adamson <andros@netapp.com> | 2012-05-22 08:09:26 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-22 16:42:37 -0400 |
| commit | 996074cb8c355bf3d87d066ba1e1189ba3f648f5 (patch) | |
| tree | 11b94acdad07bde4fffb22cd3e3cb8b5f7f8ef75 /fs | |
| parent | d42e78737c31f08893ed4916fc03104790867a71 (diff) | |
| download | linux-3.10-996074cb8c355bf3d87d066ba1e1189ba3f648f5.tar.gz linux-3.10-996074cb8c355bf3d87d066ba1e1189ba3f648f5.tar.bz2 linux-3.10-996074cb8c355bf3d87d066ba1e1189ba3f648f5.zip | |
NFSv4.1 Just use nfs_put_client in filelayout release
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4filelayout.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index f8edb14c697..46628479311 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -101,9 +101,6 @@ static void filelayout_reset_write(struct nfs_write_data *data) &hdr->pages, hdr->completion_ops); } - /* balance nfs_get_client in filelayout_write_pagelist */ - nfs_put_client(data->ds_clp); - data->ds_clp = NULL; } static void filelayout_reset_read(struct nfs_read_data *data) @@ -125,9 +122,6 @@ static void filelayout_reset_read(struct nfs_read_data *data) &hdr->pages, hdr->completion_ops); } - /* balance nfs_get_client in filelayout_read_pagelist */ - nfs_put_client(data->ds_clp); - data->ds_clp = NULL; } static int filelayout_async_handle_error(struct rpc_task *task, @@ -326,8 +320,7 @@ static void filelayout_read_release(void *data) { struct nfs_read_data *rdata = data; - if (!test_bit(NFS_IOHDR_REDO, &rdata->header->flags)) - nfs_put_client(rdata->ds_clp); + nfs_put_client(rdata->ds_clp); rdata->header->mds_ops->rpc_release(data); } @@ -424,8 +417,7 @@ static void filelayout_write_release(void *data) { struct nfs_write_data *wdata = data; - if (!test_bit(NFS_IOHDR_REDO, &wdata->header->flags)) - nfs_put_client(wdata->ds_clp); + nfs_put_client(wdata->ds_clp); wdata->header->mds_ops->rpc_release(data); } |