diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 07:58:03 -0800 |
| commit | 9853832c49dc1685587abeb4e1decd4be690d256 (patch) | |
| tree | 13510327f85b8d8c238728b47ae74e0fa5299e17 /include | |
| parent | b21761ff18c0eba67e8f2886b3c0b9cae79b5249 (diff) | |
| parent | ab1f16116527e42dec8aee176d673a41a881b809 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index a516b671687..b7736ab8bb5 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; |