| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 22 Nov 2011 16:54:15 +0000 (08:54 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 22 Nov 2011 16:54:15 +0000 (08:54 -0800) |
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFS: Revert pnfs ugliness from the generic NFS read code path
SUNRPC: destroy freshly allocated transport in case of sockaddr init error
NFS: Fix a regression in the referral code
nfs: move nfs_file_operations declaration to bottom of file.c (try #2)
nfs: when attempting to open a directory, fall back on normal lookup (try #5)
NFS: Revert pnfs ugliness from the generic NFS read code path
SUNRPC: destroy freshly allocated transport in case of sockaddr init error
NFS: Fix a regression in the referral code
nfs: move nfs_file_operations declaration to bottom of file.c (try #2)
nfs: when attempting to open a directory, fall back on normal lookup (try #5)
| 1 | 2 | |||
|---|---|---|---|---|
| fs/nfs/pnfs.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/nfs/pnfs.c
Simple merge