diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-02 14:43:47 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-09 12:09:38 -0400 |
commit | 259875efed06d6936f54c9a264e868937f1bc217 (patch) | |
tree | c3831c6050582e6ab90ab523131788e2b09df163 /include/linux/nfs_fs.h | |
parent | 40fef8a649e5344bfb6a67a7cc3def3e0dad6448 (diff) | |
download | blackbird-op-linux-259875efed06d6936f54c9a264e868937f1bc217.tar.gz blackbird-op-linux-259875efed06d6936f54c9a264e868937f1bc217.zip |
NFS: set transport defaults after mount option parsing is finished
Move the UDP/TCP default timeo/retrans settings for text mounts to
nfs_init_timeout_values(), which was were they were always being
initialised (and sanity checked) for binary mounts.
Document the default timeout values using appropriate #defines.
Ensure that we initialise and sanity check the transport protocols that
may have been specified by the user.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_fs.h')
-rw-r--r-- | include/linux/nfs_fs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 27d6a8d98cef..830d9cc8cdce 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -12,6 +12,11 @@ #include <linux/magic.h> /* Default timeout values */ +#define NFS_DEF_UDP_TIMEO (11) +#define NFS_DEF_UDP_RETRANS (3) +#define NFS_DEF_TCP_TIMEO (600) +#define NFS_DEF_TCP_RETRANS (2) + #define NFS_MAX_UDP_TIMEOUT (60*HZ) #define NFS_MAX_TCP_TIMEOUT (600*HZ) |