this_cpu: xfs_icsb_modify_counters does not need "cpu" variable

The xfs_icsb_modify_counters() function no longer needs the cpu variable
if we use this_cpu_ptr() and we can get rid of get/put_cpu().

Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Olaf Weber <olaf@sgi.com>
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Christoph Lameter 2009-10-03 19:48:23 +09:00 committed by Tejun Heo
parent e7dcaa4755
commit 7a9e02d6bb
1 changed files with 6 additions and 6 deletions

View File

@ -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