History

nfsd: constify nfsd_suppatttrs

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

J. Bruce Fields committed 9 years ago

Commit 5cf23db1 parent c01410f2 files · +4 −4Browse files

Unified · Split

2 files
  1. fs/nfsd/nfs4xdr.c +1 −1
  2. fs/nfsd/nfsd.h +3 −3
fs/nfsd/nfs4xdr.c+1−1
@@ -58,7 +58,7 @@ · 57 unmodified lines
5858
5959 #define NFSDDBG_FACILITY NFSDDBG_XDR
6060
61−u32 nfsd_suppattrs[3][3] = {
61+const u32 nfsd_suppattrs[3][3] = {
6262 {NFSD4_SUPPORTED_ATTRS_WORD0,
6363 NFSD4_SUPPORTED_ATTRS_WORD1,
6464 NFSD4_SUPPORTED_ATTRS_WORD2},
fs/nfsd/nfsd.h+3−3
@@ -362,16 +362,16 @@ void nfsd_lockd_shutdown(void); · 361 unmodified lines
362362 FATTR4_WORD2_MODE_UMASK | \
363363 NFSD4_2_SECURITY_ATTRS)
364364
365−extern u32 nfsd_suppattrs[3][3];
365+extern const u32 nfsd_suppattrs[3][3];
366366
367−static inline bool bmval_is_subset(u32 *bm1, u32 *bm2)
367+static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2)
368368 {
369369 return !((bm1[0] & ~bm2[0]) ||
370370 (bm1[1] & ~bm2[1]) ||
371371 (bm1[2] & ~bm2[2]));
372372 }
373373
374−static inline bool nfsd_attrs_supported(u32 minorversion, u32 *bmval)
374+static inline bool nfsd_attrs_supported(u32 minorversion, const u32 *bmval)
375375 {
376376 return bmval_is_subset(bmval, nfsd_suppattrs[minorversion]);
377377 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t