tree e62017f1b154dc1ffe0c2a95fc654fb16e98fe5c
parent 887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1
parent 72dbac37e3a0acf8e8f07fc65e34e83de83e0b28
author Linus Torvalds <torvalds@g5.osdl.org> 1152129915 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152129915 -0700

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  NLM,NFSv4: Wait on local locks before we put RPC calls on the wire
  VFS: Add support for the FL_ACCESS flag to flock_lock_file()
  NFSv4: Ensure nfs4_lock_expired() caches delegated locks
  NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lock
  VFS: Allow caller to determine if BSD or posix locks were actually freed
  NFS: Optimise away an excessive GETATTR call when a file is symlinked
  This fixes a panic doing the first READDIR or READDIRPLUS call when:
  NFS: Fix NFS page_state usage
  Revert "Merge branch 'odirect'"