leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: constify nfsd_suppatttrs

Browse Source 
To keep me from accidentally writing to this again....

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2017-01-11 20:40:36 -05:00
parent c01410f7f6
commit 5cf23dbb1d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfs4xdr.c
View File

@ -58,7 +58,7 @@
#define NFSDDBG_FACILITY NFSDDBG_XDR #define NFSDDBG_FACILITY NFSDDBG_XDR
u32 nfsd_suppattrs[3][3] = { const u32 nfsd_suppattrs[3][3] = {
{NFSD4_SUPPORTED_ATTRS_WORD0, {NFSD4_SUPPORTED_ATTRS_WORD0,
NFSD4_SUPPORTED_ATTRS_WORD1, NFSD4_SUPPORTED_ATTRS_WORD1,
NFSD4_SUPPORTED_ATTRS_WORD2}, NFSD4_SUPPORTED_ATTRS_WORD2},

6
fs/nfsd/nfsd.h
View File

@ -362,16 +362,16 @@ void nfsd_lockd_shutdown(void);
FATTR4_WORD2_MODE_UMASK | \ FATTR4_WORD2_MODE_UMASK | \
NFSD4_2_SECURITY_ATTRS) NFSD4_2_SECURITY_ATTRS)
extern u32 nfsd_suppattrs[3][3]; extern const u32 nfsd_suppattrs[3][3];
static inline bool bmval_is_subset(u32 *bm1, u32 *bm2) static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2)
{ {
return !((bm1[0] & ~bm2[0]) || return !((bm1[0] & ~bm2[0]) ||
(bm1[1] & ~bm2[1]) || (bm1[1] & ~bm2[1]) ||
(bm1[2] & ~bm2[2])); (bm1[2] & ~bm2[2]));
} }
static inline bool nfsd_attrs_supported(u32 minorversion, u32 *bmval) static inline bool nfsd_attrs_supported(u32 minorversion, const u32 *bmval)
{ {
return bmval_is_subset(bmval, nfsd_suppattrs[minorversion]); return bmval_is_subset(bmval, nfsd_suppattrs[minorversion]);
} }