kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/fs/nfs/nfs4session.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * fs/nfs/nfs4session.c
3
4
  *
..
..
@@ -55,7 +56,7 @@
55
56
 
56
57
 /**
57
58
  * nfs4_slot_tbl_drain_complete - wake waiters when drain is complete
58
- * @tbl - controlling slot table
59
+ * @tbl: controlling slot table
59
60
  *
60
61
  */
61
62
 void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl)
..
..
@@ -110,6 +111,8 @@
110
111
 		slot->table = tbl;
111
112
 		slot->slot_nr = slotid;
112
113
 		slot->seq_nr = seq_init;
114
+		slot->seq_nr_highest_sent = seq_init;
115
+		slot->seq_nr_last_acked = seq_init - 1;
113
116
 	}
114
117
 	return slot;
115
118
 }
..
..
@@ -276,7 +279,8 @@
276
279
 	p = &tbl->slots;
277
280
 	while (*p) {
278
281
 		(*p)->seq_nr = ivalue;
279
-		(*p)->interrupted = 0;
282
+		(*p)->seq_nr_highest_sent = ivalue;
283
+		(*p)->seq_nr_last_acked = ivalue - 1;
280
284
 		p = &(*p)->next;
281
285
 	}
282
286
 	tbl->highest_used_slotid = NFS4_NO_SLOT;
..
..
@@ -573,12 +577,11 @@
573
577
 void nfs4_destroy_session(struct nfs4_session *session)
574
578
 {
575
579
 	struct rpc_xprt *xprt;
576
-	struct rpc_cred *cred;
580
+	const struct cred *cred;
577
581
 
578
582
 	cred = nfs4_get_clid_cred(session->clp);
579
583
 	nfs4_proc_destroy_session(session, cred);
580
-	if (cred)
581
-		put_rpccred(cred);
584
+	put_cred(cred);
582
585
 
583
586
 	rcu_read_lock();
584
587
 	xprt = rcu_dereference(session->clp->cl_rpcclient->cl_xprt);