summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-07-01 12:12:24 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-10 23:40:44 -0400
commit5680d48be88d12cd987e5579a6072a4ca34ca6ea (patch)
tree030cb42a88efbd5ea35296d9d4d520e1ec63f618
parent9eaa67c6a5b77f248c4703d81c4a6c6434e35385 (diff)
NFS: Clean-up: Define macros for maximum host and export path name lengths
Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/super.c4
-rw-r--r--include/linux/nfs_mount.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 14c7923697d..e7d19708583 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -867,12 +867,12 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
}
}
- p = nfs_copy_user_string(NULL, &data->hostname, 256);
+ p = nfs_copy_user_string(NULL, &data->hostname, NFS4_MAXNAMLEN);
if (IS_ERR(p))
goto out_err;
hostname = p;
- p = nfs_copy_user_string(NULL, &data->mnt_path, 1024);
+ p = nfs_copy_user_string(NULL, &data->mnt_path, NFS4_MAXPATHLEN);
if (IS_ERR(p))
goto out_err;
mntpath = p;
diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
index cc8b9c59acb..0b82a17c705 100644
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
@@ -37,7 +37,7 @@ struct nfs_mount_data {
int acdirmin; /* 1 */
int acdirmax; /* 1 */
struct sockaddr_in addr; /* 1 */
- char hostname[256]; /* 1 */
+ char hostname[NFS_MAXNAMLEN + 1]; /* 1 */
int namlen; /* 2 */
unsigned int bsize; /* 3 */
struct nfs3_fh root; /* 4 */