Commit e59fb674 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfs: move nfs_fhandle_hash to common include file 



lockd needs to be able to hash filehandles for tracepoints. Move the
nfs_fhandle_hash() helper to a common nfs include file.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 244cc191

fs/nfs/internal.h

+0 −15
Original line number Diff line number Diff line
@@ -846,27 +846,12 @@ u64 nfs_timespec_to_change_attr(const struct timespec64 *ts) 
}



#ifdef CONFIG_CRC32

/**

 * nfs_fhandle_hash - calculate the crc32 hash for the filehandle

 * @fh - pointer to filehandle

 *

 * returns a crc32 hash for the filehandle that is compatible with

 * the one displayed by "wireshark".

 */

static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh)

{

	return ~crc32_le(0xFFFFFFFF, &fh->data[0], fh->size);

}

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_fhandle_hash(const struct nfs_fh *fh)

{

	return 0;

}

static inline u32 nfs_stateid_hash(nfs4_stateid *stateid)

{

	return 0;

include/linux/nfs.h

+20 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/sunrpc/msg_prot.h>

#include <linux/string.h>

#include <linux/crc32.h>

#include <uapi/linux/nfs.h>



/*
@@ -44,4 +45,23 @@ enum nfs3_stable_how { 
	/* used by direct.c to mark verf as invalid */

	NFS_INVALID_STABLE_HOW = -1

};



#ifdef CONFIG_CRC32

/**

 * nfs_fhandle_hash - calculate the crc32 hash for the filehandle

 * @fh - pointer to filehandle

 *

 * returns a crc32 hash for the filehandle that is compatible with

 * the one displayed by "wireshark".

 */

static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh)

{

	return ~crc32_le(0xFFFFFFFF, &fh->data[0], fh->size);

}

#else /* CONFIG_CRC32 */

static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh)

{

	return 0;

}

#endif /* CONFIG_CRC32 */

#endif /* _LINUX_NFS_H */