diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:27:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:27:20 -0700 |
| commit | 85bff8857c62ab2bc3ed204de3fcde74781bbdb2 (patch) | |
| tree | 9d5c8998f4c13f2b9525897ef546559c8fd49cf5 /fs | |
| parent | d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8 (diff) | |
| parent | 76a67ec6fb79ff3570dcb5342142c16098299911 (diff) | |
| download | kernel-common-85bff8857c62ab2bc3ed204de3fcde74781bbdb2.tar.gz kernel-common-85bff8857c62ab2bc3ed204de3fcde74781bbdb2.tar.bz2 kernel-common-85bff8857c62ab2bc3ed204de3fcde74781bbdb2.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index f65953be39c0..9250067943d8 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -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, |