Merge tag 'qcom-soc-for-4.3' into v4.2-rc2

[firefly-linux-kernel-4.4.55.git] / net / ceph / pagevec.c

diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index 096d91447e06e8a759ab8daf5283ddd4d27922b9..d4f5f220a8e55e063db6d3f3923a32be1ac33223 100644 (file)
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -51,10 +51,7 @@ void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty)
                        set_page_dirty_lock(pages[i]);
                put_page(pages[i]);
        }
-       if (is_vmalloc_addr(pages))
-               vfree(pages);
-       else
-               kfree(pages);
+       kvfree(pages);
 }
 EXPORT_SYMBOL(ceph_put_page_vector);