NFSv4.1/flexfiles: Fix freeing of mirrors
Subsystems (2)
PATCH 1/1 NFSv4.1/flexfiles: Fix freeing of mirrors
Mirrors are now shared objects, so we should not be freeing them directly inside ff_layout_free_lseg(). We should already be doing the right thing in _ff_layout_free_lseg(), so just let it handle things.
Also ensure that ff_layout_free_mirror() frees the RPC credential if it is set.
Fixes 28a0d72c6867 ("Add refcounting to struct nfs4_ff_layout_mirror")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/flexfilelayout/flexfilelayout.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +2 -11
@@ -213,6 +213,8 @@ static void ff_layout_free_mirror(struct nfs4_ff_layout_mirror *mirror) {ff_layout_remove_mirror (mirror);kfree (mirror->fh_versions); +if (mirror->cred) +put_rpccred (mirror->cred);nfs4_ff_layout_put_deviceid (mirror->mirror_ds);kfree (mirror); }
@@ -529,17 +531,6 @@ ff_layout_free_lseg(struct pnfs_layout_segment *lseg)dprintk ("--> %s\n" , __func__); -for (i =0 ; i < fls->mirror_array_cnt; i++) { -if (fls->mirror_array[i]) { -nfs4_ff_layout_put_deviceid (fls->mirror_array[i]->mirror_ds); - fls->mirror_array[i]->mirror_ds =NULL ; -if (fls->mirror_array[i]->cred) { -put_rpccred (fls->mirror_array[i]->cred); - fls->mirror_array[i]->cred =NULL ; - } - } - } -if (lseg->pls_range.iomode ==IOMODE_RW ) {struct nfs4_flexfile_layout *ffl;struct inode *inode;
Signature · 1 line
2.4.3