Skip to content

Commit

Permalink
NFSv4.1 fix null state reference in filelayout_async_handle_error
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Andy Adamson authored and Trond Myklebust committed May 22, 2012
1 parent 53b8ee3 commit d42e787
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/nfs/nfs4filelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ static int filelayout_async_handle_error(struct rpc_task *task,
* layout is destroyed and a new valid layout is obtained.
*/
set_bit(NFS_LAYOUT_INVALID,
&NFS_I(state->inode)->layout->plh_flags);
pnfs_destroy_layout(NFS_I(state->inode));
&NFS_I(inode)->layout->plh_flags);
pnfs_destroy_layout(NFS_I(inode));
rpc_wake_up(&tbl->slot_tbl_waitq);
goto reset;
/* RPC connection errors */
Expand All @@ -214,7 +214,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
dprintk("%s DS connection error %d\n", __func__,
task->tk_status);
if (!filelayout_test_devid_invalid(devid))
_pnfs_return_layout(state->inode);
_pnfs_return_layout(inode);
filelayout_mark_devid_invalid(devid);
rpc_wake_up(&tbl->slot_tbl_waitq);
nfs4_ds_disconnect(clp);
Expand Down

0 comments on commit d42e787

Please sign in to comment.