forked from luck/tmp_suning_uos_patched
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux: nfsd: nfsd should drop CAP_MKNOD for non-root NFSD: provide encode routine for OP_OPENATTR
This commit is contained in:
commit
85bff8857c
@ -2596,6 +2596,7 @@ static nfsd4_enc nfsd4_enc_ops[] = {
|
||||
[OP_LOOKUPP] = (nfsd4_enc)nfsd4_encode_noop,
|
||||
[OP_NVERIFY] = (nfsd4_enc)nfsd4_encode_noop,
|
||||
[OP_OPEN] = (nfsd4_enc)nfsd4_encode_open,
|
||||
[OP_OPENATTR] = (nfsd4_enc)nfsd4_encode_noop,
|
||||
[OP_OPEN_CONFIRM] = (nfsd4_enc)nfsd4_encode_open_confirm,
|
||||
[OP_OPEN_DOWNGRADE] = (nfsd4_enc)nfsd4_encode_open_downgrade,
|
||||
[OP_PUTFH] = (nfsd4_enc)nfsd4_encode_noop,
|
||||
|
@ -393,8 +393,10 @@ struct cpu_vfs_cap_data {
|
||||
# define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }})
|
||||
# define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
|
||||
# define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
|
||||
# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \
|
||||
CAP_FS_MASK_B1 } })
|
||||
# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0 \
|
||||
| CAP_TO_MASK(CAP_SYS_RESOURCE) \
|
||||
| CAP_TO_MASK(CAP_MKNOD), \
|
||||
CAP_FS_MASK_B1 } })
|
||||
|
||||
#endif /* _KERNEL_CAPABILITY_U32S != 2 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user