Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3b994d98a815d934ab6a77a380882865982c14f9

Authored by Al Viro
1 parent 34cece2e8a
Exists in smarc_imx_lf-5.15.y and in 32 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y

get rid of the second argument of acct_kill() 

Replace the old ns->bacct only with NULL and only if it still points
to acct.  And assign the new value to it *before* calling acct_kill()
in acct_on().  That way we don't need to pass the new acct to acct_kill().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 7 additions and 10 deletions Side-by-side Diff

... ... @@ -168,8 +168,7 @@
168 168 complete(&acct->done);
169 169 }
170 170  
171   -static void acct_kill(struct bsd_acct_struct *acct,
172   - struct bsd_acct_struct *new)
  171 +static void acct_kill(struct bsd_acct_struct *acct)
173 172 {
174 173 if (acct) {
175 174 struct pid_namespace *ns = acct->ns;
... ... @@ -179,7 +178,7 @@
179 178 schedule_work(&acct->work);
180 179 wait_for_completion(&acct->done);
181 180 pin_remove(&acct->pin);
182   - ns->bacct = new;
  181 + cmpxchg(&ns->bacct, acct, NULL);
183 182 acct->ns = NULL;
184 183 atomic_long_dec(&acct->count);
185 184 mutex_unlock(&acct->lock);
... ... @@ -203,7 +202,7 @@
203 202 acct_put(acct);
204 203 acct = NULL;
205 204 }
206   - acct_kill(acct, NULL);
  205 + acct_kill(acct);
207 206 }
208 207  
209 208 static int acct_on(struct filename *pathname)
... ... @@ -262,10 +261,8 @@
262 261 pin_insert(&acct->pin, mnt);
263 262  
264 263 old = acct_get(ns);
265   - if (old)
266   - acct_kill(old, acct);
267   - else
268   - ns->bacct = acct;
  264 + ns->bacct = acct;
  265 + acct_kill(old);
269 266 mutex_unlock(&acct->lock);
270 267 mnt_drop_write(mnt);
271 268 mntput(mnt);
... ... @@ -302,7 +299,7 @@
302 299 mutex_unlock(&acct_on_mutex);
303 300 putname(tmp);
304 301 } else {
305   - acct_kill(acct_get(task_active_pid_ns(current)), NULL);
  302 + acct_kill(acct_get(task_active_pid_ns(current)));
306 303 }
307 304  
308 305 return error;
... ... @@ -310,7 +307,7 @@
310 307  
311 308 void acct_exit_ns(struct pid_namespace *ns)
312 309 {
313   - acct_kill(acct_get(ns), NULL);
  310 + acct_kill(acct_get(ns));
314 311 }
315 312  
316 313 /*