Author: rmacklem
Date: Sat Oct 23 22:28:29 2010
New Revision: 214255
URL: http://svn.freebsd.org/changeset/base/214255
Log:
Modify the experimental NFSv4 server's file handle hash function
to use the generic hash32_buf() function. Although adding the
bytes seemed sufficient for UFS and ZFS, since most of the bytes
are the same for file handles on the same volume, this might not
be sufficient for other file systems. Use of a generic function
also seems preferable to one specific to NFSv4.
Suggested by: gleb.kurtsou at gmail.com
MFC after: 10 days
Modified:
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfsserver/nfs_nfsdport.c
Modified: head/sys/fs/nfs/nfs_var.h
==============================================================================
--- head/sys/fs/nfs/nfs_var.h Sat Oct 23 22:11:30 2010 (r214254)
+++ head/sys/fs/nfs/nfs_var.h Sat Oct 23 22:28:29 2010 (r214255)
@@ -576,7 +576,7 @@ void nfsvno_unlockvfs(mount_t);
int nfsvno_lockvfs(mount_t);
int nfsrv_v4rootexport(void *, struct ucred *, NFSPROC_T *);
int nfsvno_testexp(struct nfsrv_descript *, struct nfsexstuff *);
-int nfsrv_hashfh(fhandle_t *);
+uint32_t nfsrv_hashfh(fhandle_t *);
/* nfs_commonkrpc.c */
int newnfs_nmcancelreqs(struct nfsmount *);
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Sat Oct 23 22:11:30 2010
(r214254)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Sat Oct 23 22:28:29 2010
(r214255)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
*/
#include <fs/nfs/nfsport.h>
+#include <sys/hash.h>
#include <sys/sysctl.h>
#include <nlm/nlm_prot.h>
#include <nlm/nlm.h>
@@ -3090,15 +3091,12 @@ nfsvno_testexp(struct nfsrv_descript *nd
/*
* Calculate a hash value for the fid in a file handle.
*/
-int
+uint32_t
nfsrv_hashfh(fhandle_t *fhp)
{
- int hashval = 0, i;
- uint8_t *cp;
+ uint32_t hashval;
- cp = (uint8_t *)&fhp->fh_fid;
- for (i = 0; i < sizeof(struct fid); i++)
- hashval += *cp++;
+ hashval = hash32_buf(&fhp->fh_fid, sizeof(struct fid), 0);
return (hashval);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
