add user_struct element unix_inflight pre-req for "pipe: limit the per-user amount...

The commit: pipe: limit the per-user amount of pages allocated in pipes
caused a merge conflict with uek/uek-4.1 due to:
c057264c4ba7ddf9d775c013fcb1cecb910bf2b9
fix kABI breakage from "unix: properly account for FDs passed over unix sock

Add include/linux/sched.h user_struct change from c057264c so that the
code context matches uek/uek-4.1

Orabug: 22901731
Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 26a2e6122734f8237ac44d47fb6bf4e96cca124b..ac361b95ca632b367db4d43d0c5c43d9dc7e21f6 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -815,6 +815,9 @@ struct user_struct {
 #ifdef CONFIG_PERF_EVENTS
        atomic_long_t locked_vm;
 #endif
+#ifndef __GENKSYMS__
+       unsigned long unix_inflight;    /* How many files in flight in unix sockets */
+#endif
 };
 
 extern int uids_sysfs_init(void);