Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

* 'locks' of git://linux-nfs.org/~bfields/linux:
  pid-namespaces-vs-locks-interaction
  file locks: Use wait_event_interruptible_timeout()
  locks: clarify posix_locks_deadlock

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a516b6716870..b7736ab8bb5e 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;