diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-09-01 12:03:56 -0700 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-09-01 12:18:57 -0700 |
| commit | 972398fa0a5f47c6ee0bde4d6d24b29f90ec888d (patch) | |
| tree | 377664e4207e4c2bd03f6ef29b3573e8016a4f0c | |
| parent | 2d89a1d3c9ff8ceb115f001e66cff9788338ca47 (diff) | |
| download | linux-stable-972398fa0a5f47c6ee0bde4d6d24b29f90ec888d.tar.gz linux-stable-972398fa0a5f47c6ee0bde4d6d24b29f90ec888d.tar.bz2 linux-stable-972398fa0a5f47c6ee0bde4d6d24b29f90ec888d.zip | |
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 <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayout.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 61ccf1122494..ee8e7013454f 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -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); } @@ -525,21 +527,9 @@ static void ff_layout_free_lseg(struct pnfs_layout_segment *lseg) { struct nfs4_ff_layout_segment *fls = FF_LAYOUT_LSEG(lseg); - int i; 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; |