tree c2f75cc08bb4c5cbd9103e14399ea5ab66ce960d
parent 74f3ae743427b87e43b5cb9f4257021ae8ad4267
parent 380454126f1357db9270f9d1ca05dfe1a6e4ad47
author Linus Torvalds <torvalds@linux-foundation.org> 1260989264 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260989264 -0800

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFSv4: Fix a regression in the NFSv4 state manager
  NFSv4: Release the sequence id before restarting a CLOSE rpc call
  nfs41: fix session fore channel negotiation
  nfs41: do not zero seqid portion of stateid on close
  nfs: run state manager in privileged mode
  nfs: make recovery state manager operations privileged
  nfs: enforce FIFO ordering of operations trying to acquire slot
  rpc: add a new priority in RPC task
  nfs: remove rpc_task argument from nfs4_find_slot
  rpc: add rpc_queue_empty function
  nfs: change nfs4_do_setlk params to identify recovery type
  nfs: do not do a LOOKUP after open
  nfs: minor cleanup of session draining