From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Apr 2010 22:10:16 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42;p=deliverable%2Flinux.git

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 delegated locking
  NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptible
  NFS: Fix a race with the new commit code
  NFS: Ensure that writeback_single_inode() calls write_inode() when syncing
  NFS: Fix the mode calculation in nfs_find_open_context
  NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
---

0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42