diff options
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/locks.c b/fs/locks.c index 49354b9c7dc1..f36f0e61558d 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -658,8 +658,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) | |||
658 | if (cfl) { | 658 | if (cfl) { |
659 | __locks_copy_lock(fl, cfl); | 659 | __locks_copy_lock(fl, cfl); |
660 | if (cfl->fl_nspid) | 660 | if (cfl->fl_nspid) |
661 | fl->fl_pid = pid_nr_ns(cfl->fl_nspid, | 661 | fl->fl_pid = pid_vnr(cfl->fl_nspid); |
662 | task_active_pid_ns(current)); | ||
663 | } else | 662 | } else |
664 | fl->fl_type = F_UNLCK; | 663 | fl->fl_type = F_UNLCK; |
665 | unlock_kernel(); | 664 | unlock_kernel(); |
@@ -2084,7 +2083,7 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, | |||
2084 | unsigned int fl_pid; | 2083 | unsigned int fl_pid; |
2085 | 2084 | ||
2086 | if (fl->fl_nspid) | 2085 | if (fl->fl_nspid) |
2087 | fl_pid = pid_nr_ns(fl->fl_nspid, task_active_pid_ns(current)); | 2086 | fl_pid = pid_vnr(fl->fl_nspid); |
2088 | else | 2087 | else |
2089 | fl_pid = fl->fl_pid; | 2088 | fl_pid = fl->fl_pid; |
2090 | 2089 | ||