Merge tag 'nfsd-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fixes from Chuck Lever:

 - v6.15 libcrc clean-up makes invalid configurations possible

 - Fix a potential deadlock introduced during the v6.15 merge window

* tag 'nfsd-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: decrease sc_count directly if fail to queue dl_recall
  nfs: add missing selections of CONFIG_CRC32

diff --cc fs/Kconfig
Simple merge

diff --cc fs/nfs/internal.h
index ec8d32d0e2e95f306cf40920974cc67be3e484ba,59bb4d0338f39a6227333654743230e7b27fcdc5..6655e5f32ec63cb92df69e258f6261f84ffefa76
--- 1/fs/nfs/internal.h
--- 2/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@@ -905,18 -904,7 +904,12 @@@ static inline u32 nfs_stateid_hash(cons
        return ~crc32_le(0xFFFFFFFF, &stateid->other[0],
                                NFS4_STATEID_OTHER_SIZE);
  }
- #else
- static inline u32 nfs_stateid_hash(nfs4_stateid *stateid)
- {
-       return 0;
- }
- #endif
  
 +static inline bool nfs_current_task_exiting(void)
 +{
 +      return (current->flags & PF_EXITING) != 0;
 +}
 +
  static inline bool nfs_error_is_fatal(int err)
  {
        switch (err) {