Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37c24b37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux: (42 commits)
  nfsd: remove pointless paths in file headers
  nfsd: move most of nfsfh.h to fs/nfsd
  nfsd: remove unused field rq_reffh
  nfsd: enable V4ROOT exports
  nfsd: make V4ROOT exports read-only
  nfsd: restrict filehandles accepted in V4ROOT case
  nfsd: allow exports of symlinks
  nfsd: filter readdir results in V4ROOT case
  nfsd: filter lookup results in V4ROOT case
  nfsd4: don't continue "under" mounts in V4ROOT case
  nfsd: introduce export flag for v4 pseudoroot
  nfsd: let "insecure" flag vary by pseudoflavor
  nfsd: new interface to advertise export features
  nfsd: Move private headers to source directory
  vfs: nfsctl.c un-used nfsd #includes
  lockd: Remove un-used nfsd headers #includes
  s390: remove un-used nfsd #includes
  sparc: remove un-used nfsd #includes
  parsic: remove un-used nfsd #includes
  compat.c: Remove dependence on nfsd private headers
  ...
parents 5ac4d630 7663dacd

Documentation/filesystems/00-INDEX

+2 −10
Original line number Diff line number Diff line 
00-INDEX

	- this file (info on some of the filesystems supported by linux).

Exporting

	- explanation of how to make filesystems exportable.

Locking

	- info on locking rules as they pertain to Linux VFS.

9p.txt
@@ -68,12 +66,8 @@ mandatory-locking.txt 
	- info on the Linux implementation of Sys V mandatory file locking.

ncpfs.txt

	- info on Novell Netware(tm) filesystem using NCP protocol.

nfs41-server.txt

	- info on the Linux server implementation of NFSv4 minor version 1.

nfs-rdma.txt

	- how to install and setup the Linux NFS/RDMA client and server software.

nfsroot.txt

	- short guide on setting up a diskless box with NFS root filesystem.

nfs/

	- nfs-related documentation.

nilfs2.txt

	- info and mount options for the NILFS2 filesystem.

ntfs.txt
@@ -92,8 +86,6 @@ relay.txt 
	- info on relay, for efficient streaming from kernel to user space.

romfs.txt

	- description of the ROMFS filesystem.

rpc-cache.txt

	- introduction to the caching mechanisms in the sunrpc layer.

seq_file.txt

	- how to use the seq_file API

sharedsubtree.txt

Documentation/filesystems/nfs/00-INDEX

0 → 100644
+16 −0
Original line number Diff line number Diff line 
00-INDEX

	- this file (nfs-related documentation).

Exporting

	- explanation of how to make filesystems exportable.

knfsd-stats.txt

	- statistics which the NFS server makes available to user space.

nfs.txt

	- nfs client, and DNS resolution for fs_locations.

nfs41-server.txt

	- info on the Linux server implementation of NFSv4 minor version 1.

nfs-rdma.txt

	- how to install and setup the Linux NFS/RDMA client and server software

nfsroot.txt

	- short guide on setting up a diskless box with NFS root filesystem.

rpc-cache.txt

	- introduction to the caching mechanisms in the sunrpc layer.