IB/ipath: Minor fix to ordering of freeing and zeroing of tid pages.

Fixed to be the same as everywhere else.  copy and then zero the page *
in the array first, and then pass the copy to the VM routines.

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 016e7c4e366b..5de3243a47c3 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -538,6 +538,9 @@ static int ipath_tid_free(struct ipath_portdata *pd, unsigned subport,
                         continue;
                 cnt++;
                 if (dd->ipath_pageshadow[porttid + tid]) {
+                        struct page *p;
+                        p = dd->ipath_pageshadow[porttid + tid];
+                        dd->ipath_pageshadow[porttid + tid] = NULL;
                         ipath_cdbg(VERBOSE, "PID %u freeing TID %u\n",
                                    pd->port_pid, tid);
                         dd->ipath_f_put_tid(dd, &tidbase[tid],
@@ -546,9 +549,7 @@ static int ipath_tid_free(struct ipath_portdata *pd, unsigned subport,
                         pci_unmap_page(dd->pcidev,
                                 dd->ipath_physshadow[porttid + tid],
                                 PAGE_SIZE, PCI_DMA_FROMDEVICE);
-                        ipath_release_user_pages(
-                                &dd->ipath_pageshadow[porttid + tid], 1);
-                        dd->ipath_pageshadow[porttid + tid] = NULL;
+                        ipath_release_user_pages(&p, 1);
                         ipath_stats.sps_pageunlocks++;
                 } else
                         ipath_dbg("Unused tid %u, ignoring\n", tid);