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/nfs/nfs4filelayout.c | |
parent | d42e78737c31f08893ed4916fc03104790867a71 (diff) |
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/nfs/nfs4filelayout.c')
-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 f8edb14c697e..466284793119 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) | |||
101 | &hdr->pages, | 101 | &hdr->pages, |
102 | hdr->completion_ops); | 102 | hdr->completion_ops); |
103 | } | 103 | } |
104 | /* balance nfs_get_client in filelayout_write_pagelist */ | ||
105 | nfs_put_client(data->ds_clp); | ||
106 | data->ds_clp = NULL; | ||
107 | } | 104 | } |
108 | 105 | ||
109 | static void filelayout_reset_read(struct nfs_read_data *data) | 106 | static void filelayout_reset_read(struct nfs_read_data *data) |
@@ -125,9 +122,6 @@ static void filelayout_reset_read(struct nfs_read_data *data) | |||
125 | &hdr->pages, | 122 | &hdr->pages, |
126 | hdr->completion_ops); | 123 | hdr->completion_ops); |
127 | } | 124 | } |
128 | /* balance nfs_get_client in filelayout_read_pagelist */ | ||
129 | nfs_put_client(data->ds_clp); | ||
130 | data->ds_clp = NULL; | ||
131 | } | 125 | } |
132 | 126 | ||
133 | static int filelayout_async_handle_error(struct rpc_task *task, | 127 | static int filelayout_async_handle_error(struct rpc_task *task, |
@@ -326,8 +320,7 @@ static void filelayout_read_release(void *data) | |||
326 | { | 320 | { |
327 | struct nfs_read_data *rdata = data; | 321 | struct nfs_read_data *rdata = data; |
328 | 322 | ||
329 | if (!test_bit(NFS_IOHDR_REDO, &rdata->header->flags)) | 323 | nfs_put_client(rdata->ds_clp); |
330 | nfs_put_client(rdata->ds_clp); | ||
331 | rdata->header->mds_ops->rpc_release(data); | 324 | rdata->header->mds_ops->rpc_release(data); |
332 | } | 325 | } |
333 | 326 | ||
@@ -424,8 +417,7 @@ static void filelayout_write_release(void *data) | |||
424 | { | 417 | { |
425 | struct nfs_write_data *wdata = data; | 418 | struct nfs_write_data *wdata = data; |
426 | 419 | ||
427 | if (!test_bit(NFS_IOHDR_REDO, &wdata->header->flags)) | 420 | nfs_put_client(wdata->ds_clp); |
428 | nfs_put_client(wdata->ds_clp); | ||
429 | wdata->header->mds_ops->rpc_release(data); | 421 | wdata->header->mds_ops->rpc_release(data); |
430 | } | 422 | } |
431 | 423 | ||