Skip to content

Commit f97ff92

Browse files
author
Trond Myklebust
committed
pNFS/flexfiles: Clean up redundant calls to pnfs_put_lseg()
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 <[email protected]>
1 parent ac7cbb2 commit f97ff92

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/nfs/flexfilelayout/flexfilelayout.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio,
844844
if (!ds) {
845845
if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg))
846846
goto out_mds;
847-
pnfs_put_lseg(pgio->pg_lseg);
848-
pgio->pg_lseg = NULL;
847+
pnfs_generic_pg_cleanup(pgio);
849848
/* Sleep for 1 second before retrying */
850849
ssleep(1);
851850
goto retry;
@@ -871,8 +870,6 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio,
871870
0, NFS4_MAX_UINT64, IOMODE_READ,
872871
NFS_I(pgio->pg_inode)->layout,
873872
pgio->pg_lseg);
874-
pnfs_put_lseg(pgio->pg_lseg);
875-
pgio->pg_lseg = NULL;
876873
pgio->pg_maxretrans = 0;
877874
nfs_pageio_reset_read_mds(pgio);
878875
}
@@ -916,8 +913,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio,
916913
if (!ds) {
917914
if (!ff_layout_no_fallback_to_mds(pgio->pg_lseg))
918915
goto out_mds;
919-
pnfs_put_lseg(pgio->pg_lseg);
920-
pgio->pg_lseg = NULL;
916+
pnfs_generic_pg_cleanup(pgio);
921917
/* Sleep for 1 second before retrying */
922918
ssleep(1);
923919
goto retry;
@@ -939,8 +935,6 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio,
939935
0, NFS4_MAX_UINT64, IOMODE_RW,
940936
NFS_I(pgio->pg_inode)->layout,
941937
pgio->pg_lseg);
942-
pnfs_put_lseg(pgio->pg_lseg);
943-
pgio->pg_lseg = NULL;
944938
pgio->pg_maxretrans = 0;
945939
nfs_pageio_reset_write_mds(pgio);
946940
pgio->pg_error = -EAGAIN;

0 commit comments

Comments
 (0)