Linus Torvalds
61845143fe
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux ...
Pull nfsd updates from Bruce Fields:
"The main change is the pNFS block server support from Christoph, which
allows an NFS client connected to shared disk to do block IO to the
shared disk in place of NFS reads and writes. This also requires xfs
patches, which should arrive soon through the xfs tree, barring
unexpected problems. Support for other filesystems is also possible
if there's interest.
Thanks also to Chuck Lever for continuing work to get NFS/RDMA into
shape"
* 'for-3.20' of git://linux-nfs.org/~bfields/linux: (32 commits)
nfsd: default NFSv4.2 to on
nfsd: pNFS block layout driver
exportfs: add methods for block layout exports
nfsd: add trace events
nfsd: update documentation for pNFS support
nfsd: implement pNFS layout recalls
nfsd: implement pNFS operations
nfsd: make find_any_file available outside nfs4state.c
nfsd: make find/get/put file available outside nfs4state.c
nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c
nfsd: add fh_fsid_match helper
nfsd: move nfsd_fh_match to nfsfh.h
fs: add FL_LAYOUT lease type
fs: track fl_owner for leases
nfs: add LAYOUT_TYPE_MAX enum value
nfsd: factor out a helper to decode nfstime4 values
sunrpc/lockd: fix references to the BKL
nfsd: fix year-2038 nfs4 state problem
svcrdma: Handle additional inline content
svcrdma: Move read list XDR round-up logic
...
2015-02-12 10:39:41 -08:00
sched: Remove proliferation of wait_on_bit() action functions
2014-07-16 15:10:39 +02:00
update CIFS TODO list
2014-08-02 01:26:07 -05:00
configfs: convert to umode_t
2012-01-03 22:54:57 -05:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: update .gitignore files
2014-09-26 11:02:59 +02:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
9p: update documentation
2014-01-24 10:55:21 -06:00
adfs: add hexadecimal filetype suffix option
2011-03-22 17:44:17 -07:00
affs: add mount option to avoid filename truncates
2014-04-07 16:36:08 -07:00
doc: fix double words
2014-03-21 13:16:58 +01:00
autofs: the documentation I wanted to read
2014-10-14 02:18:17 +02:00
Documentation: befs.txt: no maintainer, orphaned
2011-08-13 18:34:03 -07:00
btrfs: Add treelog mount option.
2014-01-28 13:20:20 -08:00
ceph: enable/disable dentry complete flags via mount option
2012-01-12 11:00:40 -08:00
debugfs: Have debugfs_print_regs32() return void
2014-11-05 14:13:38 -05:00
vfs: take i_mutex on renamed file
2013-11-09 00:16:40 -05:00
efivarfs: Add documentation for the EFI variable filesystem
2012-10-30 10:39:18 +00:00
exofs: Add option to mount by osdname
2011-03-15 15:02:51 +02:00
ext3: allow specifying external journal by pathname mount option
2013-07-31 22:11:15 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
f2fs: introduce -o fastboot for reducing booting time only
2014-11-04 17:34:15 -08:00
fsioctl.c: make generic_block_fiemap() signal-tolerant
2015-02-10 14:30:30 -08:00
Wrap accesses to the fd_sets in struct fdtable
2012-02-19 10:30:52 -08:00
GFS2: Update glock doc to add new stats info
2012-05-10 12:41:40 +01:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
GFS2: Update main gfs2 doc
2012-05-10 11:45:31 +01:00
Documentation: HFS is orphaned
2011-11-04 12:01:48 -07:00
Documentation: update URL to hfsplus Technote 1150
2014-02-20 14:48:51 +01:00
inotify: update documentation to reflect code changes
2015-02-10 14:30:28 -08:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
vfs: add i_op->dentry_open()
2014-10-24 00:14:35 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Documentation: add makefiles for more targets
2014-09-26 11:02:56 +02:00
nilfs2: update project's web site in nilfs2.txt
2014-04-03 16:21:26 -07:00
NTFS: Remove changelog from Documentation/filesystems/ntfs.txt.
2014-10-16 12:43:57 +01:00
ocfs2: add a mount option journal_async_commit on ocfs2 filesystem
2015-02-10 14:30:29 -08:00
ovl: rename filesystem type to "overlay"
2014-11-20 16:39:59 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
kill f_dentry macro
2014-11-19 13:02:11 -05:00
Merge branch 'akpm' (patches from Andrew)
2015-02-11 18:23:28 -08:00
doc: filesystems : Fix typo in Documentations/filesystems
2013-08-20 13:45:56 +02:00
initmpfs: use initramfs if rootfstype= or root= specified
2013-09-11 15:59:38 -07:00
doc: Fix typo in doucmentations
2013-07-25 12:34:15 +02:00
Documentation/filesystems/romfs.txt: fixing link to genromfs
2011-02-17 22:04:46 +01:00
Documentation: update seq_file
2014-12-29 15:40:18 -07:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Squashfs: Add LZ4 compression configuration option
2014-11-27 18:48:44 +00:00
PCI: Allow read/write access to sysfs I/O port resources
2010-07-30 09:32:08 -07:00
doc: Fix typo in doucmentations
2013-07-25 12:34:15 +02:00
Documentation/filesystems/sysfs.txt: fix device_attribute declaration
2014-01-23 16:37:00 -08:00
mempolicy: document cpuset interaction with tmpfs mpol mount option
2010-05-25 08:06:57 -07:00
UBIFS: switch self-check knobs to debugfs
2011-07-04 10:54:28 +03:00
fs/fat/: add support for DOS 1.x formatted volumes
2014-06-06 16:08:10 -07:00
Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next
2014-11-19 13:02:53 -05:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
xfs: add metadata CRC documentation
2013-04-27 13:27:43 -05:00
Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next
2015-02-10 09:24:25 +11:00
61845143fe