projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
file.c
diff --git
a/fs/file.c
b/fs/file.c
index 66923fe3176e49b03617e2f5477bb8e05fc89dc3..ab3eb6a8823940643ab376782cd9a1e47c583c98 100644
(file)
--- 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);
struct file * file = xchg(&fdt->fd[i], NULL);
if (file) {
filp_close(file, files);
- cond_resched();
+ cond_resched
_rcu_qs
();
}
}
i++;
}
}
i++;
@@
-750,6
+750,7
@@
bool get_close_on_exec(unsigned int fd)
static int do_dup2(struct files_struct *files,
struct file *file, unsigned fd, unsigned flags)
static int do_dup2(struct files_struct *files,
struct file *file, unsigned fd, unsigned flags)
+__releases(&files->file_lock)
{
struct file *tofree;
struct fdtable *fdt;
{
struct file *tofree;
struct fdtable *fdt;