From patchwork Mon Jul 25 03:53:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 12927720 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C59C43334 for ; Mon, 25 Jul 2022 03:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbiGYDxQ (ORCPT ); Sun, 24 Jul 2022 23:53:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbiGYDxO (ORCPT ); Sun, 24 Jul 2022 23:53:14 -0400 Received: from mail-vs1-xe2e.google.com (mail-vs1-xe2e.google.com [IPv6:2607:f8b0:4864:20::e2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72EF8B875 for ; Sun, 24 Jul 2022 20:53:13 -0700 (PDT) Received: by mail-vs1-xe2e.google.com with SMTP id c3so9541597vsc.6 for ; Sun, 24 Jul 2022 20:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=vMX64v3lO6R78aE0hkfqjTyO6T5HJrTDFvQQiADpQ3I=; b=k9JMiBx4QCBMocH7XgwN53tmdvnU07zId8DvRT9kKprca9VYkFwF/iHvdqlB6wrHOy 7uDsVTwoKO3B6mnKTDsO25wvx8yew0Z8IKpnhdgXqgggSI+FOQi6kQnkG7a9UWSBEVF2 9iB15oVPLIMQxnMh21MIiK5bljIiYdcrJ3PjbmnVKPsiXiTm33gpiW53HV4Nea5Ympa+ N3c6y4ekpcspeHph1Jbkf+bClu7f9ygnaGMWiDPfledorir/oelPoX/dkyO9m3tnQaUL wv2a3ibDKbugJEt1PjZ0dZicfW5rosdwzzGJxF6GJPxWfYneUlfUF3Zoll6xck1s5UfF 7nlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=vMX64v3lO6R78aE0hkfqjTyO6T5HJrTDFvQQiADpQ3I=; b=uEyF3LITtuYlEgjmoFxYrvUrT8Ob7id/+V/MyQnqrjMczfHhX/mHSPjgUVGYlvZOvs l9npcirrC2Kl+81N9AF3Px0hm1BSkAEv+HML26fAQv12qKn+jLHQz6soV4xCShLEuA/T 6fj63JyheVTMDYcCduhuVORbT9q8VedvuBbt6C3nas4F4iD5vqFCPzrGdofLIGjzc1rM SRiocujeU3dZ36Cml1XMTIOA6uHKrJj1iFsP5WYcA/vcfUiPlk2lurOwToayGxzbwGU7 amcTBZBRwmcBRoS1r5r6YG0bOXd+TIbZW8aNp19eo8mmjc1Uj1ZjUMi3z8Kf3OT3zQhe Il/g== X-Gm-Message-State: AJIora9ZCiXTYV8bLb+OMnQiykSJQPtn1AjbB49nhPEmcV1gY7Q7gznz H6d3hPodCEAMLc5MWUrKEFkdhuItkZHiQ2nME+Cts7TFKX4Stw== X-Google-Smtp-Source: AGRyM1tRBdm3XpwbM8IFOms3Dhnc1gS5IWsJNyix0zjqWBqLe8O+e+sju66DMmvhMAPgiyLNtrC4cZ9jfcv6EnOh50Q= X-Received: by 2002:a05:6102:c94:b0:357:c72d:b7b3 with SMTP id f20-20020a0561020c9400b00357c72db7b3mr2949678vst.17.1658721192234; Sun, 24 Jul 2022 20:53:12 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Sun, 24 Jul 2022 22:53:01 -0500 Message-ID: Subject: [PATCH][CIFS] cleanup remaining distracting build warnings To: CIFS Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Removed remaining warnings related to externs. See attached patch. These warnings although harmless could be distracting e.g. fs/cifs/cifsfs.c: note: in included file: fs/cifs/cifsglob.h:1968:24: warning: symbol 'sesInfoAllocCount' was not declared. Should it be static? From 69181fdfafadb3fea7fad4fca63bb0dc6690cefe Mon Sep 17 00:00:00 2001 From: Steve French Date: Sun, 24 Jul 2022 22:47:59 -0500 Subject: [PATCH] cifs: remove remaining build warnings Removed remaining warnings related to externs. These warnings although harmless could be distracting e.g. fs/cifs/cifsfs.c: note: in included file: fs/cifs/cifsglob.h:1968:24: warning: symbol 'sesInfoAllocCount' was not declared. Should it be static? Signed-off-by: Steve French --- fs/cifs/cifsfs.c | 19 +++++++++++++++++++ fs/cifs/cifsglob.h | 22 +++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index f909d9e9faaa..eba879f86e4d 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -68,6 +68,25 @@ bool enable_negotiate_signing; /* false by default */ unsigned int global_secflags = CIFSSEC_DEF; /* unsigned int ntlmv2_support = 0; */ unsigned int sign_CIFS_PDUs = 1; + +/* + * Global transaction id (XID) information + */ +unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */ +unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */ +unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */ +spinlock_t GlobalMid_Lock; /* protects above & list operations on midQ entries */ + +/* + * Global counters, updated atomically + */ +atomic_t sesInfoAllocCount; +atomic_t tconInfoAllocCount; +atomic_t tcpSesNextId; +atomic_t tcpSesAllocCount; +atomic_t tcpSesReconnectCount; +atomic_t tconInfoReconnectCount; + atomic_t mid_count; atomic_t buf_alloc_count; atomic_t small_buf_alloc_count; diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 9b7f409bfc8c..54ea709fe0dd 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1958,20 +1958,20 @@ extern spinlock_t cifs_tcp_ses_lock; /* * Global transaction id (XID) information */ -GLOBAL_EXTERN unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */ -GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */ -GLOBAL_EXTERN unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */ -GLOBAL_EXTERN spinlock_t GlobalMid_Lock; /* protects above & list operations */ - /* on midQ entries */ +extern unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */ +extern unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */ +extern unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */ +extern spinlock_t GlobalMid_Lock; /* protects above & list operations on midQ entries */ + /* * Global counters, updated atomically */ -GLOBAL_EXTERN atomic_t sesInfoAllocCount; -GLOBAL_EXTERN atomic_t tconInfoAllocCount; -GLOBAL_EXTERN atomic_t tcpSesNextId; -GLOBAL_EXTERN atomic_t tcpSesAllocCount; -GLOBAL_EXTERN atomic_t tcpSesReconnectCount; -GLOBAL_EXTERN atomic_t tconInfoReconnectCount; +extern atomic_t sesInfoAllocCount; +extern atomic_t tconInfoAllocCount; +extern atomic_t tcpSesNextId; +extern atomic_t tcpSesAllocCount; +extern atomic_t tcpSesReconnectCount; +extern atomic_t tconInfoReconnectCount; /* Various Debug counters */ extern atomic_t buf_alloc_count; /* current number allocated */ -- 2.34.1