To keep me from accidentally writing to this again....
Unified · Split
| @@ -58,7 +58,7 @@ · 57 unmodified lines | |||
| 58 | 58 | ||
| 59 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 59 | #define NFSDDBG_FACILITY NFSDDBG_XDR |
| 60 | 60 | ||
| 61 | u32 nfsd_suppattrs[3][3] = { | 61 | const 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}, |
| @@ -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 | ||
| 365 | extern u32 nfsd_suppattrs[3][3]; | 365 | extern const u32 nfsd_suppattrs[3][3]; |
| 366 | 366 | ||
| 367 | static inline bool bmval_is_subset(u32 *bm1, u32 *bm2) | 367 | static 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 | ||
| 374 | static inline bool nfsd_attrs_supported(u32 minorversion, u32 *bmval) | 374 | static 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 | } |