summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2012-05-22 08:09:28 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-22 16:42:28 -0400
commitd42e78737c31f08893ed4916fc03104790867a71 (patch)
tree4a152d8d4c5a944895c52c4badbc639118bd03f4
parent53b8ee346463946f88b3e1639d688c384df1166c (diff)
downloadblackbird-op-linux-d42e78737c31f08893ed4916fc03104790867a71.tar.gz
blackbird-op-linux-d42e78737c31f08893ed4916fc03104790867a71.zip
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>
-rw-r--r--fs/nfs/nfs4filelayout.c6
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,
* 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 */
@@ -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);
OpenPOWER on IntegriCloud