aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2021-04-21 07:48:43 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-04-21 07:53:03 -0400
commitd99f2487e1de23a2e902d1a359a85a48bfd21fe7 (patch)
treec6603eaabd56f359ab56383d209e582fc8ad71e7
parentNFSv4.1: Simplify layout return in pnfs_layout_process() (diff)
downloadlinux-dev-d99f2487e1de23a2e902d1a359a85a48bfd21fe7.tar.xz
linux-dev-d99f2487e1de23a2e902d1a359a85a48bfd21fe7.zip
NFS: The 'fattr_valid' field in struct nfs_server should be unsigned int
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 <dan.carpenter@oracle.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
-rw-r--r--include/linux/nfs_fs_sb.h3
1 files changed, 1 insertions, 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 */