This is a note to let you know that I've just added the patch titled
NFSD: Update file_hashtbl() helpers
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-update-file_hashtbl-helpers.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3ac41c7dc2312e3fd4ce27676c54c596f06981f4 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Fri, 28 Oct 2022 10:47:22 -0400
Subject: NFSD: Update file_hashtbl() helpers
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
[ Upstream commit 3fe828caddd81e68e9d29353c6e9285a658ca056 ]
Enable callers to use const pointers for type safety.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Reviewed-by: NeilBrown <neilb@xxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/nfs4state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -721,7 +721,7 @@ static unsigned int ownerstr_hashval(str
#define FILE_HASH_BITS 8
#define FILE_HASH_SIZE (1 << FILE_HASH_BITS)
-static unsigned int file_hashval(struct svc_fh *fh)
+static unsigned int file_hashval(const struct svc_fh *fh)
{
struct inode *inode = d_inode(fh->fh_dentry);
@@ -4687,7 +4687,7 @@ move_to_close_lru(struct nfs4_ol_stateid
/* search file_hashtbl[] for file */
static struct nfs4_file *
-find_file_locked(struct svc_fh *fh, unsigned int hashval)
+find_file_locked(const struct svc_fh *fh, unsigned int hashval)
{
struct nfs4_file *fp;
Patches currently in stable-queue which might be from chuck.lever@xxxxxxxxxx are
queue-6.1/nfsd-refactor-find_file.patch
queue-6.1/nfsd-register-unregister-of-nfsd-client-shrinker-at-nfsd-startup-shutdown-time.patch
queue-6.1/nfsd-refactoring-courtesy_client_reaper-to-a-generic-low-memory-shrinker.patch
queue-6.1/lockd-use-locks_inode_context-helper.patch
queue-6.1/nfsd-remove-redundant-assignment-to-variable-host_err.patch
queue-6.1/nfsd-use-set_bit-rq_dropme.patch
queue-6.1/nfsd-ignore-requests-to-disable-unsupported-versions.patch
queue-6.1/nfsd-fix-licensing-header-in-filecache.c.patch
queue-6.1/nfsd-add-delegation-reaper-to-react-to-low-memory-condition.patch
queue-6.1/nfsd-trace-stateids-returned-via-delegreturn.patch
queue-6.1/lockd-ensure-we-use-the-correct-file-descriptor-when-unlocking.patch
queue-6.1/trace-relocate-event-helper-files.patch
queue-6.1/nfsd-update-file_hashtbl-helpers.patch
queue-6.1/nfsd-clean-up-nfs4_preprocess_stateid_op-call-sites.patch
queue-6.1/nfsd-don-t-destroy-global-nfs4_file-table-in-per-net-shutdown.patch
queue-6.1/nfsd-use-only-rq_dropme-to-signal-the-need-to-drop-a-reply.patch
queue-6.1/nfsd-use-locks_inode_context-helper.patch
queue-6.1/nfsd-use-struct_size-helper-in-alloc_session.patch
queue-6.1/nfsd-fix-up-the-filecache-laundrette-scheduling.patch
queue-6.1/nfsd-move-nfserrno-to-vfs.c.patch
queue-6.1/exportfs-use-pr_debug-for-unreachable-debug-statements.patch
queue-6.1/nfsd-use-const-pointers-as-parameters-to-fh_-helpers.patch
queue-6.1/nfsd-use-rhashtable-for-managing-nfs4_file-objects.patch
queue-6.1/nfsd-clean-up-nfsd4_init_file.patch
queue-6.1/nfsd-add-a-nfsd4_file_hash_remove-helper.patch
queue-6.1/nfsd-simplify-read_plus.patch
queue-6.1/nfsd-trace-delegation-revocations.patch
queue-6.1/nfsd-allow-disabling-nfsv2-at-compile-time.patch
queue-6.1/nfsd-flesh-out-a-documenting-comment-for-filecache.c.patch
queue-6.1/nfsd-replace-delayed_work-with-work_struct-for-nfsd_client_shrinker.patch
queue-6.1/lockd-set-missing-fl_flags-field-when-retrieving-args.patch
queue-6.1/filelock-add-a-new-locks_inode_context-accessor-function.patch
queue-6.1/nfsd-add-support-for-sending-cb_recall_any.patch
queue-6.1/lockd-fix-file-selection-in-nlmsvc_cancel_blocked.patch
queue-6.1/nfsd-add-cb_recall_any-tracepoints.patch
queue-6.1/nfsd-avoid-clashing-function-prototypes.patch
queue-6.1/nfsd-clean-up-find_or_add_file.patch
