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-8130 libcfs: port working hash from upstream
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
libcfs_fail.h
diff --git
a/libcfs/include/libcfs/libcfs_fail.h
b/libcfs/include/libcfs/libcfs_fail.h
index
88c8f71
..
d3651f8
100644
(file)
--- a/
libcfs/include/libcfs/libcfs_fail.h
+++ b/
libcfs/include/libcfs/libcfs_fail.h
@@
-16,10
+16,6
@@
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see http://www.gnu.org/licenses
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see http://www.gnu.org/licenses
*
- * Please contact Oracle Corporation, Inc., 500 Oracle Parkway, Redwood Shores,
- * CA 94065 USA or visit www.oracle.com if you need additional information or
- * have any questions.
- *
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
@@
-53,6
+49,10
@@
enum {
CFS_FAIL_LOC_VALUE = 3
};
CFS_FAIL_LOC_VALUE = 3
};
+/* Failure ranges
+ "0x0100 - 0x3fff" for Lustre
+ "0xe000 - 0xefff" for LNet
+ "0xf000 - 0xffff" for LNDs */
/* Failure injection control */
#define CFS_FAIL_MASK_SYS 0x0000FF00
#define CFS_FAIL_MASK_LOC (0x000000FF | CFS_FAIL_MASK_SYS)
/* Failure injection control */
#define CFS_FAIL_MASK_SYS 0x0000FF00
#define CFS_FAIL_MASK_LOC (0x000000FF | CFS_FAIL_MASK_SYS)
@@
-156,7
+156,6
@@
static inline int cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
#define CFS_FAULT_CHECK(id) \
CFS_FAIL_CHECK(CFS_FAULT | (id))
#define CFS_FAULT_CHECK(id) \
CFS_FAIL_CHECK(CFS_FAULT | (id))
-#ifdef __KERNEL__
/* The idea here is to synchronise two threads to force a race. The
* first thread that calls this with a matching fail_loc is put to
* sleep. The next thread that calls with the same fail_loc wakes up
/* The idea here is to synchronise two threads to force a race. The
* first thread that calls this with a matching fail_loc is put to
* sleep. The next thread that calls with the same fail_loc wakes up
@@
-179,9
+178,5
@@
static inline void cfs_race(__u32 id)
}
}
#define CFS_RACE(id) cfs_race(id)
}
}
#define CFS_RACE(id) cfs_race(id)
-#else
-/* sigh. an expedient fix until CFS_RACE is fixed up */
-#define CFS_RACE(foo) do {} while(0)
-#endif
#endif /* _LIBCFS_FAIL_H */
#endif /* _LIBCFS_FAIL_H */