diff options
author | Andy Adamson <andros@netapp.com> | 2012-05-22 08:09:28 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-22 16:42:28 -0400 |
commit | d42e78737c31f08893ed4916fc03104790867a71 (patch) | |
tree | 4a152d8d4c5a944895c52c4badbc639118bd03f4 /fs/nfs/nfs4filelayout.c | |
parent | 53b8ee346463946f88b3e1639d688c384df1166c (diff) |
NFSv4.1 fix null state reference in filelayout_async_handle_error
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 33849d3bc885..f8edb14c697e 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -199,8 +199,8 @@ static int filelayout_async_handle_error(struct rpc_task *task, | |||
199 | * layout is destroyed and a new valid layout is obtained. | 199 | * layout is destroyed and a new valid layout is obtained. |
200 | */ | 200 | */ |
201 | set_bit(NFS_LAYOUT_INVALID, | 201 | set_bit(NFS_LAYOUT_INVALID, |
202 | &NFS_I(state->inode)->layout->plh_flags); | 202 | &NFS_I(inode)->layout->plh_flags); |
203 | pnfs_destroy_layout(NFS_I(state->inode)); | 203 | pnfs_destroy_layout(NFS_I(inode)); |
204 | rpc_wake_up(&tbl->slot_tbl_waitq); | 204 | rpc_wake_up(&tbl->slot_tbl_waitq); |
205 | goto reset; | 205 | goto reset; |
206 | /* RPC connection errors */ | 206 | /* RPC connection errors */ |
@@ -214,7 +214,7 @@ static int filelayout_async_handle_error(struct rpc_task *task, | |||
214 | dprintk("%s DS connection error %d\n", __func__, | 214 | dprintk("%s DS connection error %d\n", __func__, |
215 | task->tk_status); | 215 | task->tk_status); |
216 | if (!filelayout_test_devid_invalid(devid)) | 216 | if (!filelayout_test_devid_invalid(devid)) |
217 | _pnfs_return_layout(state->inode); | 217 | _pnfs_return_layout(inode); |
218 | filelayout_mark_devid_invalid(devid); | 218 | filelayout_mark_devid_invalid(devid); |
219 | rpc_wake_up(&tbl->slot_tbl_waitq); | 219 | rpc_wake_up(&tbl->slot_tbl_waitq); |
220 | nfs4_ds_disconnect(clp); | 220 | nfs4_ds_disconnect(clp); |