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
58 58
59#define NFSDDBG_FACILITY NFSDDBG_XDR59#define NFSDDBG_FACILITY NFSDDBG_XDR
60 60
61u32 nfsd_suppattrs[3][3] = {61const u32 nfsd_suppattrs[3][3] = {
62 {NFSD4_SUPPORTED_ATTRS_WORD0,62 {NFSD4_SUPPORTED_ATTRS_WORD0,
63 NFSD4_SUPPORTED_ATTRS_WORD1,63 NFSD4_SUPPORTED_ATTRS_WORD1,
64 NFSD4_SUPPORTED_ATTRS_WORD2},64 NFSD4_SUPPORTED_ATTRS_WORD2},
fs/nfsd/nfsd.h+3−3
@@ -362,16 +362,16 @@ void nfsd_lockd_shutdown(void); · 361 unmodified lines
362 FATTR4_WORD2_MODE_UMASK | \362 FATTR4_WORD2_MODE_UMASK | \
363 NFSD4_2_SECURITY_ATTRS)363 NFSD4_2_SECURITY_ATTRS)
364 364
365extern u32 nfsd_suppattrs[3][3];365extern const u32 nfsd_suppattrs[3][3];
366 366
367static inline bool bmval_is_subset(u32 *bm1, u32 *bm2)367static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2)
368{368{
369 return !((bm1[0] & ~bm2[0]) ||369 return !((bm1[0] & ~bm2[0]) ||
370 (bm1[1] & ~bm2[1]) ||370 (bm1[1] & ~bm2[1]) ||
371 (bm1[2] & ~bm2[2]));371 (bm1[2] & ~bm2[2]));
372}372}
373 373
374static inline bool nfsd_attrs_supported(u32 minorversion, u32 *bmval)374static inline bool nfsd_attrs_supported(u32 minorversion, const u32 *bmval)
375{375{
376 return bmval_is_subset(bmval, nfsd_suppattrs[minorversion]);376 return bmval_is_subset(bmval, nfsd_suppattrs[minorversion]);
377}377}

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