nfsd: remove nfs4_lock_state: nfs4_laundromat
authorJeff Layton <jlayton@primarydata.com>
Wed, 30 Jul 2014 12:27:35 +0000 (08:27 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 5 Aug 2014 14:55:20 +0000 (10:55 -0400)
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c

index 3b9a1a6..f5d434c 100644 (file)
@@ -4152,8 +4152,6 @@ nfs4_laundromat(struct nfsd_net *nn)
        time_t cutoff = get_seconds() - nn->nfsd4_lease;
        time_t t, new_timeo = nn->nfsd4_lease;
 
-       nfs4_lock_state();
-
        dprintk("NFSD: laundromat service - starting\n");
        nfsd4_end_grace(nn);
        INIT_LIST_HEAD(&reaplist);
@@ -4221,7 +4219,6 @@ nfs4_laundromat(struct nfsd_net *nn)
        spin_unlock(&nn->client_lock);
 
        new_timeo = max_t(time_t, new_timeo, NFSD_LAUNDROMAT_MINTIMEOUT);
-       nfs4_unlock_state();
        return new_timeo;
 }