DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-02-04 07:58:03 -08:00
parent b21761ff18 ab1f161165
commit 9853832c49
2 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/fs.h
View File

@@ -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;