NFSv4: Ensure the lockowners are labelled using the fl_owner and/or fl_pid

flock locks want to be labelled using the process pid, while posix locks
want to be labelled using the fl_owner.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --cc fs/nfs/nfs4_fs.h
Simple merge

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

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

diff --cc fs/nfs/nfs4xdr.c
Simple merge