From 64359e3a392e792ff6a9d0383d447236ef841270 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 4 Mar 2013 13:18:14 -0500 Subject: [PATCH] --- yaml --- r: 363295 b: refs/heads/master c: e0d11aed1966df0858564b58d2e355d36ff38e06 h: refs/heads/master i: 363293: 71b8c78e53bbef7600c304a6242e43dfa867ecd1 363291: 880ab975cca0a78ac67c4d3f5b8cbb71d89a51af 363287: 1e30c38408628f0d56e6f469910d89556201055d 363279: d0bc413474e4d50d4467e427349d8f20701f750f 363263: 2f0623bfd634689796c5805bf52e44e367ea5b0e v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/zcache-main.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 89b97ab8cbdb..3f2b7c393d9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f4336fbbe666490b1dccb39b3c0499a051da09b +refs/heads/master: e0d11aed1966df0858564b58d2e355d36ff38e06 diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c index 4272ab9c29ff..f455151377ab 100644 --- a/trunk/drivers/staging/zcache/zcache-main.c +++ b/trunk/drivers/staging/zcache/zcache-main.c @@ -253,6 +253,14 @@ static inline void dec_zcache_pers_zpages(unsigned zpages) { zcache_pers_zpages = atomic_sub_return(zpages, &zcache_pers_zpages_atomic); } + +static inline unsigned long curr_pageframes_count(void) +{ + return zcache_pageframes_alloced - + atomic_read(&zcache_pageframes_freed_atomic) - + atomic_read(&zcache_eph_pageframes_atomic) - + atomic_read(&zcache_pers_pageframes_atomic); +}; /* but for the rest of these, counting races are ok */ static ssize_t zcache_flush_total; static ssize_t zcache_flush_found; @@ -565,10 +573,7 @@ static void zcache_free_page(struct page *page) BUG(); __free_page(page); inc_zcache_pageframes_freed(); - curr_pageframes = zcache_pageframes_alloced - - atomic_read(&zcache_pageframes_freed_atomic) - - atomic_read(&zcache_eph_pageframes_atomic) - - atomic_read(&zcache_pers_pageframes_atomic); + curr_pageframes = curr_pageframes_count(); if (curr_pageframes > max_pageframes) max_pageframes = curr_pageframes; if (curr_pageframes < min_pageframes)