From patchwork Thu Jul 25 18:34:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Lovenberg X-Patchwork-Id: 2833627 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3947E9F4D4 for ; Thu, 25 Jul 2013 18:35:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 262212046C for ; Thu, 25 Jul 2013 18:35:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00A7720467 for ; Thu, 25 Jul 2013 18:35:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757050Ab3GYSfE (ORCPT ); Thu, 25 Jul 2013 14:35:04 -0400 Received: from mail-ve0-f177.google.com ([209.85.128.177]:50678 "EHLO mail-ve0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756828Ab3GYSfD (ORCPT ); Thu, 25 Jul 2013 14:35:03 -0400 Received: by mail-ve0-f177.google.com with SMTP id cz10so688165veb.36 for ; Thu, 25 Jul 2013 11:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=jhZzg12Jj0nMvaliQZbSEZ9K1AEUvKOvWGHpGmQwjrM=; b=N956ik9Biy/DhdUww6ChQa2ggb/pzmWRhXw2U3WDAKWtCJqQVp6tqrbaZLhECNcC/w /DVkZJtFEC1yaqTl8LhP72u0vy9ugZ21tE94GYOgbms037o+6frwL2cKdf26vlO4MziZ 7EmT01h4qAJo3SnYJPZKUhdEgXRtzXaJ/TyLQj1gHv3IOus513oDnjon6tlRncnmAZ8I IhhMn1I1TkJqVIDRdD6a7RCl529MldeLynWRsrv3tUzVOIsYsFNepzDmhAjvHPAqzde2 HFuVtjCA9sFCBDN7zTp/qYaTX/enJTY0G81FIyRTYteeXEL1Cw/J+t1DAsh8cegA3ook DEoQ== X-Received: by 10.52.245.3 with SMTP id xk3mr15773535vdc.57.1374777299444; Thu, 25 Jul 2013 11:34:59 -0700 (PDT) Received: from nix.cleftstone.net ([64.9.42.64]) by mx.google.com with ESMTPSA id tu6sm18761511vec.2.2013.07.25.11.34.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 11:34:58 -0700 (PDT) From: scott.lovenberg@gmail.com To: sfrench@samba.org Cc: Scott Lovenberg , jlayton@redhat.com, linux-cifs@vger.kernel.org, gang.chen@asianux.com, samba-technical@lists.samba.org Subject: [PATCH 1/2] cifs: Move and expand MAX_SERVER_SIZE Date: Thu, 25 Jul 2013 14:34:44 -0400 Message-Id: <1374777285-25639-1-git-send-email-scott.lovenberg@gmail.com> X-Mailer: git-send-email 1.8.1.4 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Scott Lovenberg 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 Reviewed-by: Jeff Layton --- 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 */