| commit | 0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 13 Apr 2010 22:10:16 +0000 (13 15:10 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 13 Apr 2010 22:10:16 +0000 (13 15:10 -0700) | ||
| tree | 1358c7920438e090605695f6fb8e7989eb3f8998 | treesnapshot (tar.gz zip) |
| parent | 44d2d371d250b44cbe40f8d47e329c97668d7594 | commitdiff |
| parent | 0df5dd4aae211edeeeb84f7f84f6d093406d7c22 | commitdiff |
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
* '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