diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
| commit | cf2ec150fc5f59dbf2260863225c79aa0cfc46af (patch) | |
| tree | bd55070b0bc2f8597c35b575374bd0cd2f2d14d6 /Documentation | |
| parent | 9f4def9ae4772ea3da5e2359de698742ebae53b5 (diff) | |
| parent | e36cd4a2873c398ba188f16e4087cce7f00a1506 (diff) | |
| download | blackbird-op-linux-cf2ec150fc5f59dbf2260863225c79aa0cfc46af.tar.gz blackbird-op-linux-cf2ec150fc5f59dbf2260863225c79aa0cfc46af.zip | |
Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
* 'for-linus' of git://linux-nfs.org/~bfields/linux:
nfsd: don't allow setting ctime over v4
Update to NFS/RDMA documentation
locks: don't call ->copy_lock methods on return of conflicting locks
lockd: unlock lockd locks held for a certain filesystem
lockd: unlock lockd locks associated with a given server ip
leases: remove unneeded variable from fcntl_setlease().
leases: move lock allocation earlier in generic_setlease()
leases: when unlocking, skip locking-related steps
leases: fix a return-value mixup
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/nfs-rdma.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/filesystems/nfs-rdma.txt b/Documentation/filesystems/nfs-rdma.txt index 1ae34879574b..d0ec45ae4e7d 100644 --- a/Documentation/filesystems/nfs-rdma.txt +++ b/Documentation/filesystems/nfs-rdma.txt @@ -5,7 +5,7 @@ ################################################################################ Author: NetApp and Open Grid Computing - Date: February 25, 2008 + Date: April 15, 2008 Table of Contents ~~~~~~~~~~~~~~~~~ @@ -197,12 +197,16 @@ NFS/RDMA Setup - On the server system, configure the /etc/exports file and start the NFS/RDMA server. - Exports entries with the following format have been tested: + Exports entries with the following formats have been tested: - /vol0 10.97.103.47(rw,async) 192.168.0.47(rw,async,insecure,no_root_squash) + /vol0 192.168.0.47(fsid=0,rw,async,insecure,no_root_squash) + /vol0 192.168.0.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash) - Here the first IP address is the client's Ethernet address and the second - IP address is the clients IPoIB address. + The IP address(es) is(are) the client's IPoIB address for an InfiniBand HCA or the + cleint's iWARP address(es) for an RNIC. + + NOTE: The "insecure" option must be used because the NFS/RDMA client does not + use a reserved port. Each time a machine boots: |
