diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:34:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 16:34:12 +1000 |
| commit | 757c227da97dd4fcb6f87329e3d13b7ea968fcb2 (patch) | |
| tree | 1fb759942fd21286696ea7a522a3d49211f218ed /fs | |
| parent | e9813e6833993d9c0c7fd3bc7d7182ebc8ba1464 (diff) | |
| parent | 1de76486353158501fe65b9529e6a704ddbd49fc (diff) | |
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index 66923fe3176e..1cafc4c9275b 100644 --- a/fs/file.c +++ b/fs/file.c @@ -367,7 +367,7 @@ static struct fdtable *close_files(struct files_struct * files) struct file * file = xchg(&fdt->fd[i], NULL); if (file) { filp_close(file, files); - cond_resched(); + cond_resched_rcu_qs(); } } i++; |