From patchwork Wed Apr 21 15:56:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12216391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16ADEC433ED for ; Wed, 21 Apr 2021 15:56:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C967361445 for ; Wed, 21 Apr 2021 15:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235446AbhDUP4l (ORCPT ); Wed, 21 Apr 2021 11:56:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:43882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234894AbhDUP4k (ORCPT ); Wed, 21 Apr 2021 11:56:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F183B6144A; Wed, 21 Apr 2021 15:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619020567; bh=h4ycg7tPvAV4rChpkWI+ZqgNAiIdzxlW9glZog3vL3M=; h=From:To:Cc:Subject:Date:From; b=Zr4634N91XAYwOVh8VaF//ANZqFSi+c80iRWwmsPQOiA8O1Hsv40dpM8FssZQqqum HYBO7kcl/W44bicj8zvAIg/lrTwviIm4rv9C5b0KseoKE+zYkOngsviPxMcqmBszb5 WHTIr4oKig9OPQNpNrWS7QMyyVxHIG2hip+QlxRdLsCHv0uv3OEscRcUEXbrgD/Lq5 Q+u3FT6P0xd54EnC0dFaiORH7Sx9LFl8ozHaZlazeLDZWiAnBaF5wlQubFPS6KrRZr 3dPx6L8UeLX04Cy0KbsFGSFr87JhmfIlXY+Sduh8KeaIQOe+8uO7NU4QGSjaKuMjlG FfRO6iHziPtqA== From: trondmy@kernel.org To: Dan Carpenter Cc: linux-nfs@vger.kernel.org Subject: [PATCH] NFS: The 'fattr_valid' field in struct nfs_server should be unsigned int Date: Wed, 21 Apr 2021 11:56:05 -0400 Message-Id: <20210421155605.225693-1-trondmy@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust Fix up a static compiler warning: "fs/nfs/nfs4proc.c:3882 _nfs4_server_capabilities() warn: was expecting a 64 bit value instead of '(1 << 11)'" The fix is to convert the fattr_valid field to match the type of the 'valid' field in struct nfs_fattr. Reported-by: Dan Carpenter Signed-off-by: Trond Myklebust --- include/linux/nfs_fs_sb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index d28d7a62864f..70057b2e606e 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -156,6 +156,7 @@ struct nfs_server { #define NFS_MOUNT_WRITE_EAGER 0x01000000 #define NFS_MOUNT_WRITE_WAIT 0x02000000 + unsigned int fattr_valid; /* Valid attributes */ unsigned int caps; /* server capabilities */ unsigned int rsize; /* read size */ unsigned int rpages; /* read size (in pages) */ @@ -191,8 +192,6 @@ struct nfs_server { dev_t s_dev; /* superblock dev numbers */ struct nfs_auth_info auth_info; /* parsed auth flavors */ - __u64 fattr_valid; /* Valid attributes */ - #ifdef CONFIG_NFS_FSCACHE struct nfs_fscache_key *fscache_key; /* unique key for superblock */ struct fscache_cookie *fscache; /* superblock cookie */