Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 17c0a5aaffa63da6b5c73a31e36616bdcd12d143

Authored by Al Viro
1 parent 0aec09d049
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

make acct_kill() wait for file closing. 

Do actual closing of file via schedule_work().  And use
__fput_sync() there.

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

Showing 1 changed file with 17 additions and 3 deletions Side-by-side Diff

... ... @@ -92,6 +92,8 @@
92 92 unsigned long needcheck;
93 93 struct file *file;
94 94 struct pid_namespace *ns;
  95 + struct work_struct work;
  96 + struct completion done;
95 97 };
96 98  
97 99 static void acct_free_rcu(struct rcu_head *head)
98 100  
99 101  
... ... @@ -176,15 +178,27 @@
176 178 return res;
177 179 }
178 180  
  181 +static void close_work(struct work_struct *work)
  182 +{
  183 + struct bsd_acct_struct *acct = container_of(work, struct bsd_acct_struct, work);
  184 + struct file *file = acct->file;
  185 + mnt_unpin(file->f_path.mnt);
  186 + if (file->f_op->flush)
  187 + file->f_op->flush(file, NULL);
  188 + __fput_sync(file);
  189 + complete(&acct->done);
  190 +}
  191 +
179 192 static void acct_kill(struct bsd_acct_struct *acct,
180 193 struct bsd_acct_struct *new)
181 194 {
182 195 if (acct) {
183   - struct file *file = acct->file;
184 196 struct pid_namespace *ns = acct->ns;
185 197 do_acct_process(acct);
186   - mnt_unpin(file->f_path.mnt);
187   - filp_close(file, NULL);
  198 + INIT_WORK(&acct->work, close_work);
  199 + init_completion(&acct->done);
  200 + schedule_work(&acct->work);
  201 + wait_for_completion(&acct->done);
188 202 spin_lock(&acct_lock);
189 203 hlist_del(&acct->m_list);
190 204 hlist_del(&acct->s_list);