]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
NFSv4.2: encode_readdir - only ask for labels when doing readdirplus
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 4 Nov 2013 18:23:59 +0000 (13:23 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 4 Nov 2013 21:42:51 +0000 (16:42 -0500)
commitd204c5d2b8f7614350cd4609f4d4cdcf25494d74
treebad66f4fac985065c1466a5186c629da41ae77cc
parent3da580aab9482f5bf88ea79a4bf0a511eea6fa44
NFSv4.2: encode_readdir - only ask for labels when doing readdirplus

Currently, if the server is doing NFSv4.2 and supports labeled NFS, then
our on-the-wire READDIR request ends up asking for the label information,
which is then ignored unless we're doing readdirplus.
This patch ensures that READDIR doesn't ask the server for label information
at all unless the readdir->bitmask contains the FATTR4_WORD2_SECURITY_LABEL
attribute, and the readdir->plus flag is set.

While we're at it, optimise away the 3rd bitmap field if it is zero.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4xdr.c