From: Trond Myklebust Date: Mon, 4 Oct 2010 21:59:08 +0000 (-0400) Subject: NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers X-Git-Tag: v2.6.37-rc1~120^2~27 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1007d37e00144b72906a4bdc47d517ae91bcc1;p=pandora-kernel.git NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers In the case of a server reboot, the state recovery thread starts by calling nfs4_state_end_reclaim_reboot() in order to avoid edge conditions when the server reboots while the client is in the middle of recovery. However, if the client has already marked the nfs4_state as requiring reboot recovery, then the above behaviour will cause the recovery thread to treat the open as if it was part of such an edge condition: the open will be recovered as if it was part of a lease expiration (and all the locks will be lost). Fix is to remove the call to nfs4_state_mark_reclaim_reboot from nfs4_async_handle_error(), and nfs4_handle_exception(). Instead we leave it to the recovery thread to do this for us. Signed-off-by: Trond Myklebust Cc: stable@kernel.org --- Reading git-diff-tree failed