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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

125

fs/locks.c

View file

1

include/linux/fs.h

View file