From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Mar 2017 19:55:57 +0000 (-0800)
Subject: Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer... 
X-Git-Tag: v4.11-rc1~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e58bc927835a;p=karo-tx-linux.git

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs updates from Miklos Szeredi:
 "Because copy up can take a long time, serialized copy ups could be a
  big performance bottleneck. This update allows concurrent copy up of
  regular files eliminating this potential problem.

  There are also minor fixes"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials
  ovl: properly implement sync_filesystem()
  ovl: concurrent copy up of regular files
  ovl: introduce copy up waitqueue
  ovl: copy up regular file using O_TMPFILE
  ovl: rearrange code in ovl_copy_up_locked()
  ovl: check if upperdir fs supports O_TMPFILE
---

e58bc927835a6f5ddbe4d2e069c9082b706810e7
diff --cc fs/overlayfs/util.c
index 9dc1c0af586b,01157d6e8cfe..1953986ee6bc
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@@ -10,8 -10,7 +10,9 @@@
  #include <linux/fs.h>
  #include <linux/mount.h>
  #include <linux/slab.h>
 +#include <linux/cred.h>
  #include <linux/xattr.h>
++#include <linux/sched/signal.h>
  #include "overlayfs.h"
  #include "ovl_entry.h"