Sergey Vlasov dd143426ea NFS: Fix fcntl F_GETLK not reporting some conflicts ...

commit 21ac19d484 upstream.

The commit 129a84de23 (locks: fix F_GETLK
regression (failure to find conflicts)) fixed the posix_test_lock()
function by itself, however, its usage in NFS changed by the commit
9d6a8c5c21 (locks: give posix_test_lock
same interface as ->lock) remained broken - subsequent NFS-specific
locking code received F_UNLCK instead of the user-specified lock type.
To fix the problem, fl->fl_type needs to be saved before the
posix_test_lock() call and restored if no local conflicts were reported.

Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
Tested-by: Alexander Morozov <amorozov@etersoft.ru>
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-01-07 14:43:04 -08:00

..

cache_lib.c

NFS: Add a dns resolver for use with NFSv4 referrals and migration

2009-08-19 18:22:15 -04:00

cache_lib.h

NFS: Add a dns resolver for use with NFSv4 referrals and migration

2009-08-19 18:22:15 -04:00

callback_proc.c

nfs41: Backchannel: CB_SEQUENCE validation

2009-06-17 14:11:43 -07:00

callback_xdr.c

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

callback.c

NFSv4: Clean up the nfs.callback_tcpport option

2009-08-09 15:06:19 -04:00

callback.h

nfs41: Backchannel: update cb_sequence args and results

2009-06-17 14:11:40 -07:00

client.c

NFS: Fix a typo in nfs_sockaddr_match_ipaddr6

2010-09-20 13:18:13 -07:00

delegation.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

delegation.h

NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()

2010-04-01 15:58:28 -07:00

dir.c

nfs d_revalidate() is too trigger-happy with d_drop()

2010-05-12 14:57:04 -07:00

direct.c

NFS: Too many GETATTR and ACCESS calls after direct I/O

2010-02-23 07:37:57 -08:00

dns_resolve.c

NFS: Fix an allocation-under-spinlock bug

2010-03-15 08:50:14 -07:00

dns_resolve.h

NFS: Add a dns resolver for use with NFSv4 referrals and migration

2009-08-19 18:22:15 -04:00

file.c

NFS: Fix fcntl F_GETLK not reporting some conflicts

2011-01-07 14:43:04 -08:00

fscache-index.c

NFS: Add read context retention for FS-Cache to call back with

2009-04-03 16:42:44 +01:00

fscache.c

NFS: Fix a bug in nfs_fscache_release_page()

2010-02-23 07:37:51 -08:00

fscache.h

NFS: Propagate 'fsc' mount option through automounts

2009-09-23 14:36:39 -04:00

getroot.c

headers: mnt_namespace.h redux

2009-07-08 09:31:56 -07:00

idmap.c

SUNRPC: Replace rpc_client->cl_dentry and cl_mnt, with a cl_path

2009-08-09 15:14:24 -04:00

inode.c

NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()

2010-04-01 15:58:28 -07:00

internal.h

NFS: Allow the "nfs" file system type to support NFSv4

2009-09-08 19:50:03 -04:00

iostat.h

remove put_cpu_no_resched()

2009-06-16 19:47:48 -07:00

Kconfig

Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd

2009-06-22 12:55:50 -07:00

Makefile

NFS: Add a dns resolver for use with NFSv4 referrals and migration

2009-08-19 18:22:15 -04:00

mount_clnt.c

NFS: Fix panic after nfs_umount()

2011-01-07 14:43:04 -08:00

namespace.c

NFS: Fix nfs_path() to always return a '/' at the beginning of the path

2009-06-22 21:28:25 -07:00

nfs2xdr.c

NFS: Fix the mapping of the NFSERR_SERVERFAULT error

2010-02-23 07:37:51 -08:00

nfs3acl.c

nfs: remove unnecessary NFS_INO_INVALID_ACL checks

2009-06-17 18:02:14 -07:00

nfs3proc.c

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

nfs3xdr.c

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

nfs4_fs.h

NFSv4: Don't allow posix locking against servers that don't support it

2010-02-23 07:37:50 -08:00

nfs4namespace.c

NFSv4: Fix the referral mount code

2009-10-06 15:42:20 -04:00

nfs4proc.c

NFSv4: fix delegated locking

2010-04-26 07:41:25 -07:00

nfs4renewd.c

NFSv4: Kill nfs4_renewd_prepare_shutdown()

2009-10-08 11:50:55 -04:00

nfs4state.c

const: make file_lock_operations const

2009-09-22 07:17:25 -07:00

nfs4xdr.c

acl trouble after upgrading ubuntu

2010-08-10 10:20:35 -07:00

nfsroot.c

NFS: Update MNT and MNT3 reply decoding functions

2009-06-17 18:02:13 -07:00

pagelist.c

NFS: Avoid a deadlock in nfs_release_page

2010-04-01 15:58:29 -07:00

proc.c

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

read.c

NFS: Fix an O_DIRECT Oops...

2009-08-12 08:21:39 -07:00

super.c

nfs: Add "lookupcache" to displayed mount options

2010-08-26 16:41:41 -07:00

symlink.c

nfs: remove unnecessary NFS_NEED_* defines

2008-04-23 16:13:37 -04:00

sysctl.c

[PATCH] nfs: fix congestion control

2007-03-16 19:25:05 -07:00

unlink.c

nfs41: use rpc prepare call state for session reset

2009-06-17 12:25:07 -07:00

write.c

NFS: Fix a reference leak in nfs_wb_cancel_page()

2010-02-23 07:37:50 -08:00