From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jan 2024 00:13:57 +0000 (-0800)
Subject: Merge tag 'nfs-for-6.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=587217f9706a4ff033196d819db52e32afa29654;p=linux.git

Merge tag 'nfs-for-6.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull nfs client updates from Anna Schumaker:
 "New Features:
   - Always ask for type with READDIR
   - Remove nfs_writepage()

  Bugfixes:
   - Fix a suspicious RCU usage warning
   - Fix a blocklayoutdriver reference leak
   - Fix the block driver's calculation of layoutget size
   - Fix handling NFS4ERR_RETURNCONFLICT
   - Fix _xprt_switch_find_current_entry()
   - Fix v4.1 backchannel request timeouts
   - Don't add zero-length pnfs block devices
   - Use the parent cred in nfs_access_login_time()

  Cleanups:
   - A few improvements when dealing with referring calls from the
     server
   - Clean up various unused variables, struct fields, and function
     calls
   - Various tracepoint improvements"

* tag 'nfs-for-6.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (21 commits)
  NFSv4.1: Use the nfs_client's rpc timeouts for backchannel
  SUNRPC: Fixup v4.1 backchannel request timeouts
  rpc_pipefs: Replace one label in bl_resolve_deviceid()
  nfs: Remove writepage
  NFS: drop unused nfs_direct_req bytes_left
  pNFS: Fix the pnfs block driver's calculation of layoutget size
  nfs: print fileid in lookup tracepoints
  nfs: rename the nfs_async_rename_done tracepoint
  nfs: add new tracepoint at nfs4 revalidate entry point
  SUNRPC: fix _xprt_switch_find_current_entry logic
  NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT
  NFSv4.1: if referring calls are complete, trust the stateid argument
  NFSv4: Track the number of referring calls in struct cb_process_state
  NFS: Use parent's objective cred in nfs_access_login_time()
  NFSv4: Always ask for type with READDIR
  pnfs/blocklayout: Don't add zero-length pnfs_block_dev
  blocklayoutdriver: Fix reference leak of pnfs_device_node
  SUNRPC: Fix a suspicious RCU usage warning
  SUNRPC: Create a helper function for accessing the rpc_clnt's xprt_switch
  SUNRPC: Remove unused function rpc_clnt_xprt_switch_put()
  ...
---

587217f9706a4ff033196d819db52e32afa29654
diff --cc fs/nfs/callback.h
index 0279b78b5fc90,cc1b6620a0c22..650758ee0d5fe
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@@ -19,13 -19,33 +19,14 @@@ enum nfs4_callback_procnum 
  	CB_COMPOUND = 1,
  };
  
 -enum nfs4_callback_opnum {
 -	OP_CB_GETATTR = 3,
 -	OP_CB_RECALL  = 4,
 -/* Callback operations new to NFSv4.1 */
 -	OP_CB_LAYOUTRECALL  = 5,
 -	OP_CB_NOTIFY        = 6,
 -	OP_CB_PUSH_DELEG    = 7,
 -	OP_CB_RECALL_ANY    = 8,
 -	OP_CB_RECALLABLE_OBJ_AVAIL = 9,
 -	OP_CB_RECALL_SLOT   = 10,
 -	OP_CB_SEQUENCE      = 11,
 -	OP_CB_WANTS_CANCELLED = 12,
 -	OP_CB_NOTIFY_LOCK   = 13,
 -	OP_CB_NOTIFY_DEVICEID = 14,
 -/* Callback operations new to NFSv4.2 */
 -	OP_CB_OFFLOAD = 15,
 -	OP_CB_ILLEGAL = 10044,
 -};
 -
  struct nfs4_slot;
  struct cb_process_state {
- 	__be32			drc_status;
  	struct nfs_client	*clp;
  	struct nfs4_slot	*slot;
- 	u32			minorversion;
  	struct net		*net;
+ 	u32			minorversion;
+ 	__be32			drc_status;
+ 	unsigned int		referring_calls;
  };
  
  struct cb_compound_hdr_arg {