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 1cafc4c9275b6b7b58f7b6f82a8d4e35bda1794d..ab3eb6a8823940643ab376782cd9a1e47c583c98 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -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)
+__releases(&files->file_lock)
 {
        struct file *tofree;
        struct fdtable *fdt;