Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp996572yba; Thu, 4 Apr 2019 02:02:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiF8vHyxndk1W/DyozPhr2aHS4rxib3N0HtvNnoRbd2kfrUUQ6PEDbVYUmjSG/zrvbbSO0 X-Received: by 2002:a17:902:a5ca:: with SMTP id t10mr5007422plq.234.1554368576241; Thu, 04 Apr 2019 02:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554368576; cv=none; d=google.com; s=arc-20160816; b=w2ju3NXGx8S83gmFY9u5wMzWs7AfmbqmOdIMYezCXUI1p4nVLzPchCKdTurwoXDLvB O3qiIeelHofK8HnU4T0RwOSH9XodUjUQdlRuOQMqYjq/7/6KCzR92IIsH9uilr6+eGab 76eJWeQ6n3xRz+ChUueAAVQLdi1p3mEui+DLOGXjTgYN2rVAN8mi+s8z/vmkg/aPuWHM t6zVGt8B6tJV0Dhr+TchMmBIfhfFx81NWAw6DA+BaY62Q8p92ouHrGZhkzrCqQ4UHePa sYaS6mIzG5Qkg2b59T/xccCjei1kldiyEVaqEDZcDDOdmI9Ern5dnoOiamY6dZib93eL sRZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ErMkTmW3LbM7ZC3K0v7PfFtZDT6o+SWYvC60PncMmzY=; b=MBwRyvxcVqe7uu/Jg+JS9n5oXycG4+SUWl2XkW56k9kZ+eBqljERFHEo4jr4FisWFh I8jTTcosHhbVg5P9XY6/bA5/EG135wA7pGqQfZIF6b6jI+v8XGtP5lUZ+wpkc3NxxrVD rkX+iQL8fypulvO0n7jMyhd8jYUQpB5Fvhat6Ec72KktD9gjCvz0LK/W0vrqYRyABmbO Hq7T//gGGSW00drFOz9hc2lftycrUKICtRoY1mubQ2I5TTDT+iBiMHgxkijM7sRXRzyh kjf0421e8Uj1vsZ2Ee0+wPUKkq5Oc981xvZdpSyKtE1yc1wnRsRvYb4QkL3U6ZscSkH3 AJXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VUKCeLg/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o123si16556038pfb.116.2019.04.04.02.02.40; Thu, 04 Apr 2019 02:02:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VUKCeLg/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731321AbfDDJAw (ORCPT + 99 others); Thu, 4 Apr 2019 05:00:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:37718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731063AbfDDJAv (ORCPT ); Thu, 4 Apr 2019 05:00:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDCD72184B; Thu, 4 Apr 2019 09:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368450; bh=9FvT18zG5ZSLuuIfxd3sw3/cGx63jsMKhDSI4Fuilvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUKCeLg/kXE79jqUBw/1O1IuSv/xAEl2LQ6unohsjwKx9rmTJIkeM6me7edKhuAnR 69l1UnDFC5S8jOutqqDQG8iL2kZ//dFmEnfHAVTHLn2dUtZ8/eZebOjgLBRWzA2sZD gTDomXfsr6mJKTCG1jLYIrEagpRoibCJTc67s+ao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Louis Taylor , Steve French , Nick Desaulniers , Sasha Levin Subject: [PATCH 4.19 036/187] cifs: use correct format characters Date: Thu, 4 Apr 2019 10:46:13 +0200 Message-Id: <20190404084604.767331398@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084603.119654039@linuxfoundation.org> References: <20190404084603.119654039@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 259594bea574e515a148171b5cd84ce5cbdc028a ] When compiling with -Wformat, clang emits the following warnings: fs/cifs/smb1ops.c:312:20: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat] tgt_total_cnt, total_in_tgt); ^~~~~~~~~~~~ fs/cifs/cifs_dfs_ref.c:289:4: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] ref->flags, ref->server_type); ^~~~~~~~~~ fs/cifs/cifs_dfs_ref.c:289:16: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] ref->flags, ref->server_type); ^~~~~~~~~~~~~~~~ fs/cifs/cifs_dfs_ref.c:291:4: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] ref->ref_flag, ref->path_consumed); ^~~~~~~~~~~~~ fs/cifs/cifs_dfs_ref.c:291:19: warning: format specifies type 'short' but the argument has type 'int' [-Wformat] ref->ref_flag, ref->path_consumed); ^~~~~~~~~~~~~~~~~~ The types of these arguments are unconditionally defined, so this patch updates the format character to the correct ones for ints and unsigned ints. Link: https://github.com/ClangBuiltLinux/linux/issues/378 Signed-off-by: Louis Taylor Signed-off-by: Steve French Reviewed-by: Nick Desaulniers Signed-off-by: Sasha Levin --- fs/cifs/cifs_dfs_ref.c | 4 ++-- fs/cifs/smb1ops.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 6b61df117fd4..563e2f6268c3 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -271,9 +271,9 @@ static void dump_referral(const struct dfs_info3_param *ref) { cifs_dbg(FYI, "DFS: ref path: %s\n", ref->path_name); cifs_dbg(FYI, "DFS: node path: %s\n", ref->node_name); - cifs_dbg(FYI, "DFS: fl: %hd, srv_type: %hd\n", + cifs_dbg(FYI, "DFS: fl: %d, srv_type: %d\n", ref->flags, ref->server_type); - cifs_dbg(FYI, "DFS: ref_flags: %hd, path_consumed: %hd\n", + cifs_dbg(FYI, "DFS: ref_flags: %d, path_consumed: %d\n", ref->ref_flag, ref->path_consumed); } diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 378151e09e91..47db8eb6cbcf 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -308,7 +308,7 @@ coalesce_t2(char *second_buf, struct smb_hdr *target_hdr) remaining = tgt_total_cnt - total_in_tgt; if (remaining < 0) { - cifs_dbg(FYI, "Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%hu\n", + cifs_dbg(FYI, "Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%u\n", tgt_total_cnt, total_in_tgt); return -EPROTO; } -- 2.19.1