From: Trond Myklebust Date: Tue, 30 Apr 2013 16:43:42 +0000 (-0400) Subject: NFSv4.x: Fix handling of partially delegated locks X-Git-Tag: v3.10-rc1~33^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5a2a15f8146fdfe45078df7873a6dc1006b3869;p=pandora-kernel.git NFSv4.x: Fix handling of partially delegated locks If a NFS client receives a delegation for a file after it has taken a lock on that file, we can currently end up in a situation where we mistakenly skip unlocking that file. The following patch swaps an erroneous check in nfs4_proc_unlck for whether or not the file has a delegation to one which checks whether or not we hold a lock stateid for that file. Reported-by: Chuck Lever Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org [>=3.7] Tested-by: Chuck Lever --- Reading git-diff-tree failed