From: J. Bruce Fields Date: Sat, 30 Oct 2010 21:31:16 +0000 (-0400) Subject: nfsd4: initialize delegation pointer to lease X-Git-Tag: v2.6.37-rc1~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcf744a96c66ca6ad7301a372034b771e57f30c4;p=pandora-kernel.git nfsd4: initialize delegation pointer to lease The NFSv4 server was initializing the dp->dl_flock pointer by the somewhat ridiculous method of a locks_copy_lock callback. Now that setlease uses the passed-in lock instead of doing a copy, dl_flock no longer gets set, resulting in the lock leaking on delegation release, and later possible hangs (among other problems). So, initialize dl_flock and get rid of the callback. Signed-off-by: J. Bruce Fields Acked-by: Arnd Bergmann Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed