Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[mirror_ubuntu-bionic-kernel.git] / fs / nfs / nfs42proc.c

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 608501971fe06f2fce96044ab995071a098abc66..d12ff9385f493f374c5b0aa7a184efa8275cc55c 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -397,10 +397,13 @@ static void
 nfs42_layoutstat_release(void *calldata)
 {
        struct nfs42_layoutstat_data *data = calldata;
-       struct nfs_server *nfss = NFS_SERVER(data->args.inode);
+       struct nfs42_layoutstat_devinfo *devinfo = data->args.devinfo;
+       int i;
 
-       if (nfss->pnfs_curr_ld->cleanup_layoutstats)
-               nfss->pnfs_curr_ld->cleanup_layoutstats(data);
+       for (i = 0; i < data->args.num_dev; i++) {
+               if (devinfo[i].ld_private.ops && devinfo[i].ld_private.ops->free)
+                       devinfo[i].ld_private.ops->free(&devinfo[i].ld_private);
+       }
 
        pnfs_put_layout_hdr(NFS_I(data->args.inode)->layout);
        smp_mb__before_atomic();