diff options
| author |   Peng Tao <tao.peng@primarydata.com> | 2014-09-06 00:53:29 +0800 |
|---|---|---|
| committer |   Tom Haynes <loghyr@primarydata.com> | 2015-02-03 11:06:43 -0800 |
| commit | c220106fb45909719295474e2497ffe03e47dfb3 (patch) | |
| tree | 5f4b0ba6cbe79da94576d47b74e9a73d1d552764 /fs/nfs/filelayout/filelayout.c | |
| parent | nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send (diff) | |
| download | linux-dev-c220106fb45909719295474e2497ffe03e47dfb3.tar.xz linux-dev-c220106fb45909719295474e2497ffe03e47dfb3.zip | |
nfs/filelayout: use pnfs_error_mark_layout_for_return
Instead of calling layoutreturn directly, call pnfs_error_mark_layout_for_return
to mark layouts for return and let generic code return layout when
layout segments are freed.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Conflicts:
fs/nfs/filelayout/filelayout.c
Diffstat (limited to 'fs/nfs/filelayout/filelayout.c')
| -rw-r--r-- | fs/nfs/filelayout/filelayout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index bfa8547eb2d6..5d2eadc65167 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -200,7 +200,7 @@ static int filelayout_async_handle_error(struct rpc_task *task, dprintk("%s DS connection error %d\n", __func__, task->tk_status); nfs4_mark_deviceid_unavailable(devid); - set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags); + pnfs_error_mark_layout_for_return(inode, lseg); rpc_wake_up(&tbl->slot_tbl_waitq); /* fall through */ default: |