diff options
author | Kirill A. Shutemov <kirill@shutemov.name> | 2014-06-04 19:11:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:16 -0400 |
commit | b300a4ea665f7fa44f015616ac1874deca891c5e (patch) | |
tree | f7765def77a2ba2dabbf710b3cd45b2775364372 | |
parent | b51dbec68c8732caac2495f558659556523e8322 (diff) |
kernel/user.c: drop unused field 'files' from user_struct
Nobody seems uses it for a long time. Let's drop it.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | kernel/user.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 2f2dd7d932a2..611676fd4c2c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -745,7 +745,6 @@ static inline int signal_group_exit(const struct signal_struct *sig) | |||
745 | struct user_struct { | 745 | struct user_struct { |
746 | atomic_t __count; /* reference count */ | 746 | atomic_t __count; /* reference count */ |
747 | atomic_t processes; /* How many processes does this user have? */ | 747 | atomic_t processes; /* How many processes does this user have? */ |
748 | atomic_t files; /* How many open files does this user have? */ | ||
749 | atomic_t sigpending; /* How many pending signals does this user have? */ | 748 | atomic_t sigpending; /* How many pending signals does this user have? */ |
750 | #ifdef CONFIG_INOTIFY_USER | 749 | #ifdef CONFIG_INOTIFY_USER |
751 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ | 750 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ |
diff --git a/kernel/user.c b/kernel/user.c index 294fc6a94168..4efa39350e44 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -87,7 +87,6 @@ static DEFINE_SPINLOCK(uidhash_lock); | |||
87 | struct user_struct root_user = { | 87 | struct user_struct root_user = { |
88 | .__count = ATOMIC_INIT(1), | 88 | .__count = ATOMIC_INIT(1), |
89 | .processes = ATOMIC_INIT(1), | 89 | .processes = ATOMIC_INIT(1), |
90 | .files = ATOMIC_INIT(0), | ||
91 | .sigpending = ATOMIC_INIT(0), | 90 | .sigpending = ATOMIC_INIT(0), |
92 | .locked_shm = 0, | 91 | .locked_shm = 0, |
93 | .uid = GLOBAL_ROOT_UID, | 92 | .uid = GLOBAL_ROOT_UID, |