Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit fcb94f72d3e0f4f34b326c2986da8e5996daf72c

Authored by Dave Chinner
Committed by Al Viro
1 parent e9299f5058
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

inode: convert inode_stat.nr_unused to per-cpu counters 

Before we split up the inode_lru_lock, the unused inode counter
needs to be made independent of the global inode_lru_lock. Convert
it to per-cpu counters to do this.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 11 additions and 5 deletions Side-by-side Diff

... ... @@ -95,6 +95,7 @@
95 95 struct inodes_stat_t inodes_stat;
96 96  
97 97 static DEFINE_PER_CPU(unsigned int, nr_inodes);
  98 +static DEFINE_PER_CPU(unsigned int, nr_unused);
98 99  
99 100 static struct kmem_cache *inode_cachep __read_mostly;
100 101  
... ... @@ -109,7 +110,11 @@
109 110  
110 111 static inline int get_nr_inodes_unused(void)
111 112 {
112   - return inodes_stat.nr_unused;
  113 + int i;
  114 + int sum = 0;
  115 + for_each_possible_cpu(i)
  116 + sum += per_cpu(nr_unused, i);
  117 + return sum < 0 ? 0 : sum;
113 118 }
114 119  
115 120 int get_nr_dirty_inodes(void)
... ... @@ -127,6 +132,7 @@
127 132 void __user *buffer, size_t *lenp, loff_t *ppos)
128 133 {
129 134 inodes_stat.nr_inodes = get_nr_inodes();
  135 + inodes_stat.nr_unused = get_nr_inodes_unused();
130 136 return proc_dointvec(table, write, buffer, lenp, ppos);
131 137 }
132 138 #endif
... ... @@ -340,7 +346,7 @@
340 346 spin_lock(&inode_lru_lock);
341 347 if (list_empty(&inode->i_lru)) {
342 348 list_add(&inode->i_lru, &inode_lru);
343   - inodes_stat.nr_unused++;
  349 + this_cpu_inc(nr_unused);
344 350 }
345 351 spin_unlock(&inode_lru_lock);
346 352 }
... ... @@ -350,7 +356,7 @@
350 356 spin_lock(&inode_lru_lock);
351 357 if (!list_empty(&inode->i_lru)) {
352 358 list_del_init(&inode->i_lru);
353   - inodes_stat.nr_unused--;
  359 + this_cpu_dec(nr_unused);
354 360 }
355 361 spin_unlock(&inode_lru_lock);
356 362 }
... ... @@ -656,7 +662,7 @@
656 662 (inode->i_state & ~I_REFERENCED)) {
657 663 list_del_init(&inode->i_lru);
658 664 spin_unlock(&inode->i_lock);
659   - inodes_stat.nr_unused--;
  665 + this_cpu_dec(nr_unused);
660 666 continue;
661 667 }
662 668  
... ... @@ -693,7 +699,7 @@
693 699 spin_unlock(&inode->i_lock);
694 700  
695 701 list_move(&inode->i_lru, &freeable);
696   - inodes_stat.nr_unused--;
  702 + this_cpu_dec(nr_unused);
697 703 }
698 704 if (current_is_kswapd())
699 705 __count_vm_events(KSWAPD_INODESTEAL, reap);