aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorVitaliy Gusev <vgusev@openvz.org>2008-01-17 00:07:08 +0000
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-03 17:51:36 -0500
commitab1f16116527e42dec8aee176d673a41a881b809 (patch)
tree0d20fa10151e43f9f104986a2b89ec88ca0135af /include/linux/fs.h
parent4321e01e7dce8042758349ffa2929c723b0d4107 (diff)
downloadkernel_samsung_smdk4412-ab1f16116527e42dec8aee176d673a41a881b809.zip
kernel_samsung_smdk4412-ab1f16116527e42dec8aee176d673a41a881b809.tar.gz
kernel_samsung_smdk4412-ab1f16116527e42dec8aee176d673a41a881b809.tar.bz2
pid-namespaces-vs-locks-interaction
fcntl(F_GETLK,..) can return pid of process for not current pid namespace (if process is belonged to the several namespaces). It is true also for pids in /proc/locks. So correct behavior is saving pointer to the struct pid of the process lock owner. Signed-off-by: Vitaliy Gusev <vgusev@openvz.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a516b67..b7736ab 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -872,6 +872,7 @@ struct file_lock {
struct list_head fl_block; /* circular list of blocked processes */
fl_owner_t fl_owner;
unsigned int fl_pid;
+ struct pid *fl_nspid;
wait_queue_head_t fl_wait;
struct file *fl_file;
unsigned char fl_flags;