nfsd4: reserve adequate space for LOCK op
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 12 Aug 2014 15:41:40 +0000 (11:41 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Sun, 17 Aug 2014 16:00:14 +0000 (12:00 -0400)
commitf7b43d0c992c3ec3e8d9285c3fb5e1e0eb0d031a
treec4a34e08d4d65be8d187a2bcc4a734a95dee353e
parent1383bf37ce2554d7632f21ee03f3ea815edaf933
nfsd4: reserve adequate space for LOCK op

As of  8c7424cff6 "nfsd4: don't try to encode conflicting owner if low
on space", we permit the server to process a LOCK operation even if
there might not be space to return the conflicting lockowner, because
we've made returning the conflicting lockowner optional.

However, the rpc server still wants to know the most we might possibly
return, so we need to take into account the possible conflicting
lockowner in the svc_reserve_space() call here.

Symptoms were log messages like "RPC request reserved 88 but used 108".

Fixes: 8c7424cff6 "nfsd4: don't try to encode conflicting owner if low on space"
Reported-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4xdr.c