diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-16 17:30:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-16 17:30:11 +0200 |
| commit | ec57e2f0acb01710cd465bc04495ed03a9e0fea1 (patch) | |
| tree | 9f45889ba31b750f99fd3d0b625684d9b4cd4f17 /drivers/block/xen-blkfront.c | |
| parent | 4766ab5677a2842834f9bc4a21587256a811531c (diff) | |
| parent | 72a9c673636b779e370983fea08e40f97039b981 (diff) | |
Merge branch 'x86/build' into locking/core, to pick up dependent patches and unify jump-label work
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/block/xen-blkfront.c')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index a71d817e900d..429d20131c7e 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2670,8 +2670,8 @@ static void purge_persistent_grants(struct blkfront_info *info) list_del(&gnt_list_entry->node); gnttab_end_foreign_access(gnt_list_entry->gref, 0, 0UL); rinfo->persistent_gnts_c--; - __free_page(gnt_list_entry->page); - kfree(gnt_list_entry); + gnt_list_entry->gref = GRANT_INVALID_REF; + list_add_tail(&gnt_list_entry->node, &rinfo->grants); } spin_unlock_irqrestore(&rinfo->ring_lock, flags); |