diff --git a/[refs] b/[refs] index c26181591cbc..8e28691dc19f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca04d9c3ec721e474f00992efc1b1afb625507f5 +refs/heads/master: 3d4401d9d0aef5c40706350685ddea3df6708496 diff --git a/trunk/fs/ceph/pagelist.c b/trunk/fs/ceph/pagelist.c index b6859f47d364..46a368b6dce5 100644 --- a/trunk/fs/ceph/pagelist.c +++ b/trunk/fs/ceph/pagelist.c @@ -5,10 +5,18 @@ #include "pagelist.h" +static void ceph_pagelist_unmap_tail(struct ceph_pagelist *pl) +{ + struct page *page = list_entry(pl->head.prev, struct page, + lru); + kunmap(page); +} + int ceph_pagelist_release(struct ceph_pagelist *pl) { if (pl->mapped_tail) - kunmap(pl->mapped_tail); + ceph_pagelist_unmap_tail(pl); + while (!list_empty(&pl->head)) { struct page *page = list_first_entry(&pl->head, struct page, lru); @@ -26,7 +34,7 @@ static int ceph_pagelist_addpage(struct ceph_pagelist *pl) pl->room += PAGE_SIZE; list_add_tail(&page->lru, &pl->head); if (pl->mapped_tail) - kunmap(pl->mapped_tail); + ceph_pagelist_unmap_tail(pl); pl->mapped_tail = kmap(page); return 0; }