diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-08-08 12:59:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-15 16:12:31 +1000 |
| commit | 38e312163fdb3f4647c056bade9c126a66419f64 (patch) | |
| tree | 9fef88ba76f63aa126e1302bb8887ef7d8f1d2f3 | |
| parent | 4c440fb6b816e1d290e4050ec80adaaf9d01e2b8 (diff) | |
shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
fix warnings
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Glauber Costa <glommer@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | arch/x86/kvm/mmu.c | 10 | ||||
| -rw-r--r-- | net/sunrpc/auth.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index cdcc3bfc14ea..196e0ea4b966 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -4397,12 +4397,12 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm) } } -static long +static unsigned long mmu_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { struct kvm *kvm; int nr_to_scan = sc->nr_to_scan; - long freed = 0; + unsigned long freed = 0; raw_spin_lock(&kvm_lock); @@ -4437,7 +4437,8 @@ mmu_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) goto unlock; } - freed += prepare_zap_oldest_mmu_page(kvm, &invalid_list); + if (prepare_zap_oldest_mmu_page(kvm, &invalid_list)) + freed++; kvm_mmu_commit_zap_page(kvm, &invalid_list); unlock: @@ -4458,7 +4459,8 @@ unlock: } -static long mmu_shrink_count(struct shrinker *shrink, struct shrink_control *sc) +static unsigned long +mmu_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { return percpu_counter_read_positive(&kvm_total_used_mmu_pages); } diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index fdc012da3133..495a224b7eb7 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -454,12 +454,12 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) /* * Run memory cache shrinker. */ -static long +static unsigned long rpcauth_cache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { LIST_HEAD(free); - long freed; + unsigned long freed; if ((sc->gfp_mask & GFP_KERNEL) != GFP_KERNEL) return SHRINK_STOP; @@ -476,7 +476,7 @@ rpcauth_cache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) return freed; } -static long +static unsigned long rpcauth_cache_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { |