diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-03 23:31:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-03 23:31:48 -0700 |
| commit | 7d2dbd95386a6ef97abead5cffd60ecc979c02da (patch) | |
| tree | d217fd339e61e5914463f9afa5e4a163d01103ce /drivers/misc | |
| parent | bf5ab4a6aa83cabb3860156fb47ce6ac142d197d (diff) | |
| parent | 95a027ead7d44a2c80ebeccdc0f70317e1712dbf (diff) | |
Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/uid_sys_stats.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/misc/uid_sys_stats.c b/drivers/misc/uid_sys_stats.c index 618617f3e867..ad21276c8d9e 100644 --- a/drivers/misc/uid_sys_stats.c +++ b/drivers/misc/uid_sys_stats.c @@ -95,9 +95,11 @@ static int uid_cputime_show(struct seq_file *m, void *v) { struct uid_entry *uid_entry; struct task_struct *task, *temp; + struct user_namespace *user_ns = current_user_ns(); cputime_t utime; cputime_t stime; unsigned long bkt; + uid_t uid; rt_mutex_lock(&uid_lock); @@ -108,14 +110,13 @@ static int uid_cputime_show(struct seq_file *m, void *v) read_lock(&tasklist_lock); do_each_thread(temp, task) { - uid_entry = find_or_register_uid(from_kuid_munged( - current_user_ns(), task_uid(task))); + uid = from_kuid_munged(user_ns, task_uid(task)); + uid_entry = find_or_register_uid(uid); if (!uid_entry) { read_unlock(&tasklist_lock); rt_mutex_unlock(&uid_lock); pr_err("%s: failed to find the uid_entry for uid %d\n", - __func__, from_kuid_munged(current_user_ns(), - task_uid(task))); + __func__, uid); return -ENOMEM; } task_cputime_adjusted(task, &utime, &stime); |