Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 9679f4749364..834b875900d6 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1488,9 +1488,9 @@ restart:
                                         }
                                         spin_unlock(&state->state_lock);
                                 }
-                                nfs4_put_open_state(state);
                                 clear_bit(NFS_STATE_RECLAIM_NOGRACE,
                                         &state->flags);
+                                nfs4_put_open_state(state);
                                 spin_lock(&sp->so_lock);
                                 goto restart;
                         }