From: Jeff Layton <jlayton@primarydata.com>
Date: Fri, 25 Jul 2014 11:34:25 +0000 (-0400)
Subject: nfsd: clean up nfs4_set_delegation
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~101^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b26693c56cc4beae2f913e737b15c12bc2b5b97;p=pandora-kernel.git

nfsd: clean up nfs4_set_delegation

Move the alloc_init_deleg call into nfs4_set_delegation and change the
function to return a pointer to the delegation or an IS_ERR return. This
allows us to skip allocating a delegation if the file has already
experienced a lease conflict.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

Reading git-diff-tree failed