mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Pidns: make full use of xxx_vnr() calls
Some time ago the xxx_vnr() calls (e.g. pid_vnr or find_task_by_vpid) were _all_ converted to operate on the current pid namespace. After this each call like xxx_nr_ns(foo, current->nsproxy->pid_ns) is nothing but a xxx_vnr(foo) one. Switch all the xxx_nr_ns() callers to use the xxx_vnr() calls where appropriate. Signed-off-by: Pavel Emelyanov <[email protected]> Reviewed-by: Oleg Nesterov <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Balbir Singh <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
fea9d17554
commit
6c5f3e7b43
8 changed files with 12 additions and 23 deletions
|
|
@ -658,8 +658,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl)
|
|||
if (cfl) {
|
||||
__locks_copy_lock(fl, cfl);
|
||||
if (cfl->fl_nspid)
|
||||
fl->fl_pid = pid_nr_ns(cfl->fl_nspid,
|
||||
task_active_pid_ns(current));
|
||||
fl->fl_pid = pid_vnr(cfl->fl_nspid);
|
||||
} else
|
||||
fl->fl_type = F_UNLCK;
|
||||
unlock_kernel();
|
||||
|
|
@ -2084,7 +2083,7 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
|
|||
unsigned int fl_pid;
|
||||
|
||||
if (fl->fl_nspid)
|
||||
fl_pid = pid_nr_ns(fl->fl_nspid, task_active_pid_ns(current));
|
||||
fl_pid = pid_vnr(fl->fl_nspid);
|
||||
else
|
||||
fl_pid = fl->fl_pid;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue