Commit 1ca0f935 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0bd2f269 a1d14d93

fs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ config GRACE_PERIOD 
config LOCKD

	tristate

	depends on FILE_LOCKING

	select CRC32

	select GRACE_PERIOD



config LOCKD_V4

fs/nfs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config NFS_FS

	tristate "NFS client support"

	depends on INET && FILE_LOCKING && MULTIUSER

	select CRC32

	select LOCKD

	select SUNRPC

	select NFS_COMMON
@@ -196,7 +197,6 @@ config NFS_USE_KERNEL_DNS 
config NFS_DEBUG

	bool

	depends on NFS_FS && SUNRPC_DEBUG

	select CRC32

	default y



config NFS_DISABLE_UDP_SUPPORT

fs/nfs/internal.h

+0 −7
Original line number Diff line number Diff line
@@ -899,18 +899,11 @@ u64 nfs_timespec_to_change_attr(const struct timespec64 *ts) 
	return ((u64)ts->tv_sec << 30) + ts->tv_nsec;

}



#ifdef CONFIG_CRC32

static inline u32 nfs_stateid_hash(const nfs4_stateid *stateid)

{

	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)

{

fs/nfs/nfs4session.h

+0 −4
Original line number Diff line number Diff line
@@ -148,16 +148,12 @@ static inline void nfs4_copy_sessionid(struct nfs4_sessionid *dst, 
	memcpy(dst->data, src->data, NFS4_MAX_SESSIONID_LEN);

}



#ifdef CONFIG_CRC32

/*

 * nfs_session_id_hash - calculate the crc32 hash for the session id

 * @session - pointer to session

 */

#define nfs_session_id_hash(sess_id) \

	(~crc32_le(0xFFFFFFFF, &(sess_id)->data[0], sizeof((sess_id)->data)))

#else

#define nfs_session_id_hash(session) (0)

#endif

#else /* defined(CONFIG_NFS_V4_1) */



static inline int nfs4_init_session(struct nfs_client *clp)

fs/nfsd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config NFSD 
	depends on INET

	depends on FILE_LOCKING

	depends on FSNOTIFY

	select CRC32

	select LOCKD

	select SUNRPC

	select EXPORTFS