Skip to content

Commit 3a75d0f

Browse files
author
Prakash Surya
committed
fixup: does this work?
1 parent b66a7c2 commit 3a75d0f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

fs/nfsd/nfs4state.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ renew_client_locked(struct nfs4_client *clp)
171171
}
172172

173173
list_move_tail(&clp->cl_lru, &nn->client_lru);
174-
clp->cl_time = ktime_get_boottime_seconds();
174+
clp->cl_time = ktime_get_seconds();
175175
}
176176

177177
static void put_client_renew_locked(struct nfs4_client *clp)
@@ -908,7 +908,7 @@ struct nfs4_cpntf_state *nfs4_alloc_init_cpntf_state(struct nfsd_net *nn,
908908
cps = kzalloc(sizeof(struct nfs4_cpntf_state), GFP_KERNEL);
909909
if (!cps)
910910
return NULL;
911-
cps->cpntf_time = ktime_get_boottime_seconds();
911+
cps->cpntf_time = ktime_get_seconds();
912912
refcount_set(&cps->cp_stateid.sc_count, 1);
913913
if (!nfs4_init_cp_state(nn, &cps->cp_stateid, NFS4_COPYNOTIFY_STID))
914914
goto out_free;
@@ -2764,7 +2764,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name,
27642764
gen_clid(clp, nn);
27652765
kref_init(&clp->cl_nfsdfs.cl_ref);
27662766
nfsd4_init_cb(&clp->cl_cb_null, clp, NULL, NFSPROC4_CLNT_CB_NULL);
2767-
clp->cl_time = ktime_get_boottime_seconds();
2767+
clp->cl_time = ktime_get_seconds();
27682768
clear_bit(0, &clp->cl_cb_slot_busy);
27692769
copy_verf(clp, verf);
27702770
memcpy(&clp->cl_addr, sa, sizeof(struct sockaddr_storage));
@@ -4496,7 +4496,7 @@ move_to_close_lru(struct nfs4_ol_stateid *s, struct net *net)
44964496
last = oo->oo_last_closed_stid;
44974497
oo->oo_last_closed_stid = s;
44984498
list_move_tail(&oo->oo_close_lru, &nn->close_lru);
4499-
oo->oo_time = ktime_get_boottime_seconds();
4499+
oo->oo_time = ktime_get_seconds();
45004500
spin_unlock(&nn->client_lock);
45014501
if (last)
45024502
nfs4_put_stid(&last->st_stid);
@@ -4608,7 +4608,7 @@ static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb)
46084608
*/
46094609
spin_lock(&state_lock);
46104610
if (delegation_hashed(dp) && dp->dl_time == 0) {
4611-
dp->dl_time = ktime_get_boottime_seconds();
4611+
dp->dl_time = ktime_get_seconds();
46124612
list_add_tail(&dp->dl_recall_lru, &nn->del_recall_lru);
46134613
}
46144614
spin_unlock(&state_lock);
@@ -5505,7 +5505,7 @@ static bool clients_still_reclaiming(struct nfsd_net *nn)
55055505
* If we've given them *two* lease times to reclaim, and they're
55065506
* still not done, give up:
55075507
*/
5508-
if (ktime_get_boottime_seconds() > double_grace_period_end)
5508+
if (ktime_get_seconds() > double_grace_period_end)
55095509
return false;
55105510
return true;
55115511
}
@@ -5599,7 +5599,7 @@ nfs4_laundromat(struct nfsd_net *nn)
55995599
struct nfsd4_blocked_lock *nbl;
56005600
struct list_head *pos, *next, reaplist;
56015601
struct laundry_time lt = {
5602-
.cutoff = ktime_get_boottime_seconds() - nn->nfsd4_lease,
5602+
.cutoff = ktime_get_seconds() - nn->nfsd4_lease,
56035603
.new_timeo = nn->nfsd4_lease
56045604
};
56055605
struct nfs4_cpntf_state *cps;
@@ -6007,7 +6007,7 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st,
60076007
if (status)
60086008
return status;
60096009

6010-
cps->cpntf_time = ktime_get_boottime_seconds();
6010+
cps->cpntf_time = ktime_get_seconds();
60116011

60126012
status = nfserr_expired;
60136013
found = lookup_clientid(&cps->cp_p_clid, true, nn);
@@ -6990,7 +6990,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
69906990
}
69916991

69926992
if (fl_flags & FL_SLEEP) {
6993-
nbl->nbl_time = ktime_get_boottime_seconds();
6993+
nbl->nbl_time = ktime_get_seconds();
69946994
spin_lock(&nn->blocked_locks_lock);
69956995
list_add_tail(&nbl->nbl_list, &lock_sop->lo_blocked);
69966996
list_add_tail(&nbl->nbl_lru, &nn->blocked_locks_lru);

0 commit comments

Comments
 (0)