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
Merge "LU-9771 flr: Merge branch 'flr'"
[fs/lustre-release.git]
/
lustre
/
include
/
obd_support.h
diff --git
a/lustre/include/obd_support.h
b/lustre/include/obd_support.h
index
57ac467
..
2f8a95e
100644
(file)
--- a/
lustre/include/obd_support.h
+++ b/
lustre/include/obd_support.h
@@
-468,6
+468,7
@@
extern char obd_jobid_var[];
#define OBD_FAIL_MDC_RPCS_SEM 0x804
#define OBD_FAIL_MDC_LIGHTWEIGHT 0x805
#define OBD_FAIL_MDC_CLOSE 0x806
+#define OBD_FAIL_MDC_MERGE 0x807
#define OBD_FAIL_MGS 0x900
#define OBD_FAIL_MGS_ALL_REQUEST_NET 0x901