lockd: NLM grace period shouldn't block NFSv4 opens

NLM locks don't conflict with NFSv4 share reservations, so we're not
going to learn anything new by watiting for them.

They do conflict with NFSv4 locks and with delegations.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --cc fs/lockd/svc.c
Simple merge

diff --cc fs/nfs_common/grace.c
Simple merge

diff --cc fs/nfsd/nfs4proc.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc include/linux/fs.h
Simple merge