---

yaml
---
r: 175895
b: refs/heads/master
c: 7a9e02d
h: refs/heads/master
i:
  175893: 923e9f8
  175891: a161dfb
  175887: 3ba6903
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7dcaa4755e35d7540bf19f316f8798357c53fa0
+refs/heads/master: 7a9e02d6bb05b268dc403d7ee87ce4198062f838

trunk/fs/xfs/xfs_mount.c

@@ -2389,12 +2389,12 @@ xfs_icsb_modify_counters(
 {
 	xfs_icsb_cnts_t	*icsbp;
 	long long	lcounter;	/* long counter for 64 bit fields */
-	int		cpu, ret = 0;
+	int		ret = 0;
 
 	might_sleep();
 again:
-	cpu = get_cpu();
-	icsbp = (xfs_icsb_cnts_t *)per_cpu_ptr(mp->m_sb_cnts, cpu);
+	preempt_disable();
+	icsbp = this_cpu_ptr(mp->m_sb_cnts);
 
 	/*
 	 * if the counter is disabled, go to slow path
@@ -2438,11 +2438,11 @@ xfs_icsb_modify_counters(
 		break;
 	}
 	xfs_icsb_unlock_cntr(icsbp);
-	put_cpu();
+	preempt_enable();
 	return 0;
 
 slow_path:
-	put_cpu();
+	preempt_enable();
 
 	/*
 	 * serialise with a mutex so we don't burn lots of cpu on
@@ -2490,7 +2490,7 @@ xfs_icsb_modify_counters(
 
 balance_counter:
 	xfs_icsb_unlock_cntr(icsbp);
-	put_cpu();
+	preempt_enable();
 
 	/*
 	 * We may have multiple threads here if multiple per-cpu