| Message ID | 1374777285-25639-1-git-send-email-scott.lovenberg@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 25 Jul 2013 14:34:44 -0400 scott.lovenberg@gmail.com wrote: > From: Scott Lovenberg <scott.lovenberg@gmail.com> > > MAX_SERVER_SIZE has been moved to cifs_mount.h and renamed > CIFS_NI_MAXHOST for clarity. It has been expanded to 1024 as the > previous value of 16 was very short. > > Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com> > --- > fs/cifs/cifsglob.h | 3 +-- > include/uapi/linux/cifs/cifs_mount.h | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h > index b07b122..2227699 100644 > --- a/fs/cifs/cifsglob.h > +++ b/fs/cifs/cifsglob.h > @@ -42,8 +42,7 @@ > #define MAX_SES_INFO 2 > #define MAX_TCON_INFO 4 > > -#define MAX_TREE_SIZE (2 + MAX_SERVER_SIZE + 1 + CIFS_MAX_SHARE_LEN + 1) > -#define MAX_SERVER_SIZE 15 > +#define MAX_TREE_SIZE (2 + CIFS_NI_MAXHOST + 1 + CIFS_MAX_SHARE_LEN + 1) > > #define CIFS_MIN_RCV_POOL 4 > > diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/cifs/cifs_mount.h > index f7e4aee..a58fc6e 100644 > --- a/include/uapi/linux/cifs/cifs_mount.h > +++ b/include/uapi/linux/cifs/cifs_mount.h > @@ -21,5 +21,6 @@ > #define CIFS_MAX_USERNAME_LEN 256 /* reasonable max for current servers */ > #define CIFS_MAX_PASSWORD_LEN 512 /* Windows max seems to be 256 wide chars */ > #define CIFS_MAX_SHARE_LEN 256 /* reasonable max share name length */ > +#define CIFS_NI_MAXHOST 1024 /* max host name length */ > > #endif /* _CIFS_MOUNT_H */ Looks good. Reviewed-by: Jeff Layton <jlayton@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index b07b122..2227699 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -42,8 +42,7 @@ #define MAX_SES_INFO 2 #define MAX_TCON_INFO 4 -#define MAX_TREE_SIZE (2 + MAX_SERVER_SIZE + 1 + CIFS_MAX_SHARE_LEN + 1) -#define MAX_SERVER_SIZE 15 +#define MAX_TREE_SIZE (2 + CIFS_NI_MAXHOST + 1 + CIFS_MAX_SHARE_LEN + 1) #define CIFS_MIN_RCV_POOL 4 diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/cifs/cifs_mount.h index f7e4aee..a58fc6e 100644 --- a/include/uapi/linux/cifs/cifs_mount.h +++ b/include/uapi/linux/cifs/cifs_mount.h @@ -21,5 +21,6 @@ #define CIFS_MAX_USERNAME_LEN 256 /* reasonable max for current servers */ #define CIFS_MAX_PASSWORD_LEN 512 /* Windows max seems to be 256 wide chars */ #define CIFS_MAX_SHARE_LEN 256 /* reasonable max share name length */ +#define CIFS_NI_MAXHOST 1024 /* max host name length */ #endif /* _CIFS_MOUNT_H */