OSDN Git Service

NFS: Revert "NFS: Move the flock open mode check into nfs_flock()"
authorBenjamin Coddington <bcodding@redhat.com>
Fri, 10 Nov 2017 11:27:49 +0000 (06:27 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:40:46 +0000 (08:40 +0000)
commit57f3c05d030d38355daa001ac28a4c37238e2eb8
tree25160d6b1980f4dd044cd96dd18edac048b98c35
parentafaacc000e07b084e37f5b0a0f79ce62a399f0c9
NFS: Revert "NFS: Move the flock open mode check into nfs_flock()"

commit fcfa447062b2061e11f68b846d61cbfe60d0d604 upstream.

Commit e12937279c8b "NFS: Move the flock open mode check into nfs_flock()"
changed NFSv3 behavior for flock() such that the open mode must match the
lock type, however that requirement shouldn't be enforced for flock().

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/file.c
fs/nfs/nfs4proc.c