Commit 840ef6c78e6a for kernel

commit 840ef6c78e6a2f694b578ecb9063241c992aaa9e
Merge: 09ca8dc7d634 284ea3fb4f67
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Jun 23 18:36:41 2026 -0700

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

    Pull NFS client updates from Anna Schumaker:
     "New features:
       - XPRTRDMA: Decouple req recycling from RPC completion
       - NFS: Expose FMODE_NOWAIT for read-only files

      Bugfixes:
       - SUNRPC:
          - Fix sunrpc sysfs error handling
          - Fix uninitialized xprt_create_args structure
       - XPRTRDMA:
          - Harden connect and reply handling
       - NFS:
          - Fix EOF updates after fallocate/zero-range
          - Keep PG_UPTODATE clear after read errors in page groups
          - Use nfsi->rwsem to protect traversal of the file lock list
          - Prevent resource leak in nfs_alloc_server()
       - NFSv4:
          - Clear exception state on successful mkdir retry
          - Don't skip revalidate when holding a dir delegation and attrs are stale
       - pNFS:
          - Fix use-after-free in pnfs_update_layout()
          - Defer return_range callbacks until after inode unlock
          - Fix LAYOUTCOMMIT retry loop on OLD_STATEID
          - Reject zero-length r_addr in nfs4_decode_mp_ds_addr
       - NFS/flexfiles:
          - Reject zero-length filehandle version arrays
          - Fix checking if a layout is striped
          - Fixes for honoring FF_FLAGS_NO_IO_THRU_MDS

      Other cleanups and improvements:
       - Remove the fileid field from struct nfs_inode
       - Move long-delayed xprtrdma work onto the system_dfl_long_wq
       - Convert xprtrdma send buffer free list to an llist
       - Show "<redacted>" for cert_serial and privkey_serial mount options"

    * tag 'nfs-for-7.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (42 commits)
      NFS: Use common error handling code in nfs_alloc_server()
      NFS: Prevent resource leak in nfs_alloc_server()
      NFSv4/pNFS: reject zero-length r_addr in nfs4_decode_mp_ds_addr
      nfs: don't skip revalidate on directory delegation when attrs flagged stale
      xprtrdma: Return sendctx slot after Send preparation failure
      xprtrdma: Repost Receive buffers for malformed replies
      xprtrdma: Sanitize the reply credit grant after parsing
      xprtrdma: Fix bcall rep leak and unbounded peek
      xprtrdma: Resize reply buffers before reposting receives
      xprtrdma: Check frwr_wp_create() during connect
      xprtrdma: Initialize re_id before removal registration
      xprtrdma: Fix ep kref imbalance on ADDR_CHANGE
      xprtrdma: Convert send buffer free list to llist
      NFS: correct CONFIG_NFS_V4 macro name in #endif comment
      nfs: use nfsi->rwsem to protect traversal of the file lock list
      NFSv4.1/pNFS: fix LAYOUTCOMMIT retry loop on OLD_STATEID
      nfs: expose FMODE_NOWAIT for read-only files
      nfs: add nowait version of nfs_start_io_direct
      NFSv4/flexfiles: honor FF_FLAGS_NO_IO_THRU_MDS in pg_get_mirror_count_write
      NFSv4/flexfiles: honor FF_FLAGS_NO_IO_THRU_MDS on fatal DS connect errors
      ...

diff --cc fs/nfs/inode.c
index 6227df9ae6f1,c6c939a76722..5bcd4027d203
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@@ -607,9 -580,9 +581,9 @@@ nfs_fhget(struct super_block *sb, struc
  	}
  	dprintk("NFS: nfs_fhget(%s/%Lu fh_crc=0x%08x ct=%d)\n",
  		inode->i_sb->s_id,
- 		(unsigned long long)NFS_FILEID(inode),
+ 		(unsigned long long)inode->i_ino,
  		nfs_display_fhandle_hash(fh),
 -		icount_read(inode));
 +		icount_read_once(inode));

  out:
  	return inode;