Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5092 nodemap: transfer nodemaps between MGS, MDTs, and OSTs
[fs/lustre-release.git]
/
lustre
/
include
/
obd_cksum.h
diff --git
a/lustre/include/obd_cksum.h
b/lustre/include/obd_cksum.h
index
7d00abb
..
b533f57
100644
(file)
--- a/
lustre/include/obd_cksum.h
+++ b/
lustre/include/obd_cksum.h
@@
-26,6
+26,8
@@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-65,10
+67,10
@@
static inline unsigned char cksum_obd2cfs(cksum_type_t cksum_type)
* because that is supported by all clients since 1.8
*
* In case multiple algorithms are supported the best one is used. */
* because that is supported by all clients since 1.8
*
* In case multiple algorithms are supported the best one is used. */
-static inline
obd_flag
cksum_type_pack(cksum_type_t cksum_type)
+static inline
u32
cksum_type_pack(cksum_type_t cksum_type)
{
unsigned int performance = 0, tmp;
{
unsigned int performance = 0, tmp;
-
obd_flag
flag = OBD_FL_CKSUM_ADLER;
+
u32
flag = OBD_FL_CKSUM_ADLER;
if (cksum_type & OBD_CKSUM_CRC32) {
tmp = cfs_crypto_hash_speed(cksum_obd2cfs(OBD_CKSUM_CRC32));
if (cksum_type & OBD_CKSUM_CRC32) {
tmp = cfs_crypto_hash_speed(cksum_obd2cfs(OBD_CKSUM_CRC32));
@@
-99,7
+101,7
@@
static inline obd_flag cksum_type_pack(cksum_type_t cksum_type)
return flag;
}
return flag;
}
-static inline cksum_type_t cksum_type_unpack(
obd_flag
o_flags)
+static inline cksum_type_t cksum_type_unpack(
u32
o_flags)
{
switch (o_flags & OBD_FL_CKSUM_ALL) {
case OBD_FL_CKSUM_CRC32C:
{
switch (o_flags & OBD_FL_CKSUM_ALL) {
case OBD_FL_CKSUM_CRC32C: