GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 14:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pNFS/flexfiles: Clean up redundant calls to pnfs_put_lseg()

Browse source 
Both nfs_pageio_reset_read_mds() and nfs_pageio_reset_write_mds()
do call pnfs_generic_pg_cleanup() for us.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2020-06-18 13:22:04 -04:00
parent ac7cbb2211
commit f97ff92bd1
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nfs/flexfilelayout/flexfilelayout.c
View file

@ -844,8 +844,7 @@ retry:
if (!ds) { if (!ds) {
if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg)) if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg))
goto out_mds; goto out_mds;
pnfs_put_lseg(pgio->pg_lseg); pnfs_generic_pg_cleanup(pgio);
pgio->pg_lseg = NULL;
/* Sleep for 1 second before retrying */ /* Sleep for 1 second before retrying */
ssleep(1); ssleep(1);
goto retry; goto retry;
@ -871,8 +870,6 @@ out_mds:
0, NFS4_MAX_UINT64, IOMODE_READ, 0, NFS4_MAX_UINT64, IOMODE_READ,
NFS_I(pgio->pg_inode)->layout, NFS_I(pgio->pg_inode)->layout,
pgio->pg_lseg); pgio->pg_lseg);
pnfs_put_lseg(pgio->pg_lseg);
pgio->pg_lseg = NULL;
pgio->pg_maxretrans = 0; pgio->pg_maxretrans = 0;
nfs_pageio_reset_read_mds(pgio); nfs_pageio_reset_read_mds(pgio);
} }
@ -916,8 +913,7 @@ retry:
if (!ds) { if (!ds) {
if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg)) if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg))
goto out_mds; goto out_mds;
pnfs_put_lseg(pgio->pg_lseg); pnfs_generic_pg_cleanup(pgio);
pgio->pg_lseg = NULL;
/* Sleep for 1 second before retrying */ /* Sleep for 1 second before retrying */
ssleep(1); ssleep(1);
goto retry; goto retry;
@ -939,8 +935,6 @@ out_mds:
0, NFS4_MAX_UINT64, IOMODE_RW, 0, NFS4_MAX_UINT64, IOMODE_RW,
NFS_I(pgio->pg_inode)->layout, NFS_I(pgio->pg_inode)->layout,
pgio->pg_lseg); pgio->pg_lseg);
pnfs_put_lseg(pgio->pg_lseg);
pgio->pg_lseg = NULL;
pgio->pg_maxretrans = 0; pgio->pg_maxretrans = 0;
nfs_pageio_reset_write_mds(pgio); nfs_pageio_reset_write_mds(pgio);
pgio->pg_error = -EAGAIN; pgio->pg_error = -EAGAIN;