The patch titled
Subject: proc: get rid of task lock/unlock pair to read umask for the "status" file
has been removed from the -mm tree. Its filename was
proc-get-rid-of-task-lock-unlock-pair-to-read-umask-for-the-status-file.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mateusz Guzik <mguzik@xxxxxxxxxx>
Subject: proc: get rid of task lock/unlock pair to read umask for the "status" file
get_task_umask locks/unlocks the task on its own. The only caller does
the same thing immediately after.
Utilize the fact the task has to be locked anyway and just do it once.
Since there are no other users and the code is short, fold it in.
Link: http://lkml.kernel.org/r/1517995608-23683-1-git-send-email-mguzik@xxxxxxxxxx
Signed-off-by: Mateusz Guzik <mguzik@xxxxxxxxxx>
Reviewed-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/array.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff -puN fs/proc/array.c~proc-get-rid-of-task-lock-unlock-pair-to-read-umask-for-the-status-file fs/proc/array.c
--- a/fs/proc/array.c~proc-get-rid-of-task-lock-unlock-pair-to-read-umask-for-the-status-file
+++ a/fs/proc/array.c
@@ -141,25 +141,12 @@ static inline const char *get_task_state
return task_state_array[task_state_index(tsk)];
}
-static inline int get_task_umask(struct task_struct *tsk)
-{
- struct fs_struct *fs;
- int umask = -ENOENT;
-
- task_lock(tsk);
- fs = tsk->fs;
- if (fs)
- umask = fs->umask;
- task_unlock(tsk);
- return umask;
-}
-
static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *p)
{
struct user_namespace *user_ns = seq_user_ns(m);
struct group_info *group_info;
- int g, umask;
+ int g, umask = -1;
struct task_struct *tracer;
const struct cred *cred;
pid_t ppid, tpid = 0, tgid, ngid;
@@ -177,16 +164,16 @@ static inline void task_state(struct seq
ngid = task_numa_group_id(p);
cred = get_task_cred(p);
- umask = get_task_umask(p);
- if (umask >= 0)
- seq_printf(m, "Umask:\t%#04o\n", umask);
-
task_lock(p);
+ if (p->fs)
+ umask = p->fs->umask;
if (p->files)
max_fds = files_fdtable(p->files)->max_fds;
task_unlock(p);
rcu_read_unlock();
+ if (umask >= 0)
+ seq_printf(m, "Umask:\t%#04o\n", umask);
seq_printf(m, "State:\t%s", get_task_state(p));
seq_put_decimal_ull(m, "\nTgid:\t", tgid);
_
Patches currently in -mm which might be from mguzik@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
