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-14182 lov: cancel layout lock on replay deadlock
[fs/lustre-release.git]
/
lustre
/
include
/
obd_support.h
diff --git
a/lustre/include/obd_support.h
b/lustre/include/obd_support.h
index
3edec56
..
f681534
100644
(file)
--- a/
lustre/include/obd_support.h
+++ b/
lustre/include/obd_support.h
@@
-242,6
+242,9
@@
extern char obd_jobid_var[];
#define OBD_FAIL_MDS_RMFID_NET 0x166
#define OBD_FAIL_MDS_CREATE_RACE 0x167
#define OBD_FAIL_MDS_STATFS_SPOOF 0x168
#define OBD_FAIL_MDS_RMFID_NET 0x166
#define OBD_FAIL_MDS_CREATE_RACE 0x167
#define OBD_FAIL_MDS_STATFS_SPOOF 0x168
+#define OBD_FAIL_MDS_REINT_OPEN 0x169
+#define OBD_FAIL_MDS_REINT_OPEN2 0x16a
+#define OBD_FAIL_MDS_COMMITRW_DELAY 0x16b
/* layout lock */
#define OBD_FAIL_MDS_NO_LL_GETATTR 0x170
/* layout lock */
#define OBD_FAIL_MDS_NO_LL_GETATTR 0x170
@@
-274,6
+277,8
@@
extern char obd_jobid_var[];
#define OBD_FAIL_OSD_TXN_START 0x19a
#define OBD_FAIL_OSD_DUPLICATE_MAP 0x19b
#define OBD_FAIL_OSD_REF_DEL 0x19c
#define OBD_FAIL_OSD_TXN_START 0x19a
#define OBD_FAIL_OSD_DUPLICATE_MAP 0x19b
#define OBD_FAIL_OSD_REF_DEL 0x19c
+#define OBD_FAIL_OSD_OI_ENOSPC 0x19d
+#define OBD_FAIL_OSD_DOTDOT_ENOSPC 0x19e
#define OBD_FAIL_OFD_SET_OID 0x1e0
#define OBD_FAIL_OFD_SET_OID 0x1e0
@@
-341,6
+346,7
@@
extern char obd_jobid_var[];
#define OBD_FAIL_OST_FALLOCATE_NET 0x249
#define OBD_FAIL_OST_SEEK_NET 0x24a
#define OBD_FAIL_OST_WR_ATTR_DELAY 0x250
#define OBD_FAIL_OST_FALLOCATE_NET 0x249
#define OBD_FAIL_OST_SEEK_NET 0x24a
#define OBD_FAIL_OST_WR_ATTR_DELAY 0x250
+#define OBD_FAIL_OST_RESTART_IO 0x251
#define OBD_FAIL_LDLM 0x300
#define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301
#define OBD_FAIL_LDLM 0x300
#define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301
@@
-388,6
+394,8
@@
extern char obd_jobid_var[];
#define OBD_FAIL_LDLM_GRANT_CHECK 0x32a
#define OBD_FAIL_LDLM_PROLONG_PAUSE 0x32b
#define OBD_FAIL_LDLM_LOCAL_CANCEL_PAUSE 0x32c
#define OBD_FAIL_LDLM_GRANT_CHECK 0x32a
#define OBD_FAIL_LDLM_PROLONG_PAUSE 0x32b
#define OBD_FAIL_LDLM_LOCAL_CANCEL_PAUSE 0x32c
+#define OBD_FAIL_LDLM_LOCK_REPLAY 0x32d
+#define OBD_FAIL_LDLM_REPLAY_PAUSE 0x32e
/* LOCKLESS IO */
#define OBD_FAIL_LDLM_SET_CONTENTION 0x385
/* LOCKLESS IO */
#define OBD_FAIL_LDLM_SET_CONTENTION 0x385
@@
-447,6
+455,7
@@
extern char obd_jobid_var[];
#define OBD_FAIL_PTLRPC_RESEND_RACE 0x525
#define OBD_FAIL_PTLRPC_ROUND_XID 0x530
#define OBD_FAIL_PTLRPC_CONNECT_RACE 0x531
#define OBD_FAIL_PTLRPC_RESEND_RACE 0x525
#define OBD_FAIL_PTLRPC_ROUND_XID 0x530
#define OBD_FAIL_PTLRPC_CONNECT_RACE 0x531
+#define OBD_FAIL_NET_ERROR_RPC 0x532
#define OBD_FAIL_OBD_PING_NET 0x600
/* OBD_FAIL_OBD_LOG_CANCEL_NET 0x601 obsolete since 1.5 */
#define OBD_FAIL_OBD_PING_NET 0x600
/* OBD_FAIL_OBD_LOG_CANCEL_NET 0x601 obsolete since 1.5 */
@@
-649,6
+658,7
@@
extern char obd_jobid_var[];
#define OBD_FAIL_OUT_ENOSPC 0x1704
#define OBD_FAIL_INVALIDATE_UPDATE 0x1705
#define OBD_FAIL_OUT_UPDATE_DROP 0x1707
#define OBD_FAIL_OUT_ENOSPC 0x1704
#define OBD_FAIL_INVALIDATE_UPDATE 0x1705
#define OBD_FAIL_OUT_UPDATE_DROP 0x1707
+#define OBD_FAIL_OUT_OBJECT_MISS 0x1708
/* MIGRATE */
#define OBD_FAIL_MIGRATE_ENTRIES 0x1801
/* MIGRATE */
#define OBD_FAIL_MIGRATE_ENTRIES 0x1801
@@
-697,6
+707,7
@@
extern char obd_jobid_var[];
#define OBD_FAIL_OSP_CANT_PROCESS_LLOG 0x2105
#define OBD_FAIL_OSP_INVALID_LOGID 0x2106
#define OBD_FAIL_OSP_CON_EVENT_DELAY 0x2107
#define OBD_FAIL_OSP_CANT_PROCESS_LLOG 0x2105
#define OBD_FAIL_OSP_INVALID_LOGID 0x2106
#define OBD_FAIL_OSP_CON_EVENT_DELAY 0x2107
+#define OBD_FAIL_OSP_PRECREATE_PAUSE 0x2108
/* barrier */
#define OBD_FAIL_MGS_BARRIER_READ_NET 0x2200
/* barrier */
#define OBD_FAIL_MGS_BARRIER_READ_NET 0x2200
@@
-824,8
+835,7
@@
do { \
#define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \
do { \
(ptr) = cptab == NULL ? \
#define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \
do { \
(ptr) = cptab == NULL ? \
- __vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO, \
- PAGE_KERNEL) : \
+ __ll_vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO) : \
cfs_cpt_vzalloc(cptab, cpt, size); \
if (unlikely((ptr) == NULL)) { \
CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \
cfs_cpt_vzalloc(cptab, cpt, size); \
if (unlikely((ptr) == NULL)) { \
CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \
@@
-891,7
+901,7
@@
do { \
if (is_vmalloc_addr(ptr)) { \
OBD_FREE_PRE(ptr, size, "vfreed"); \
POISON(ptr, 0x5a, size); \
if (is_vmalloc_addr(ptr)) { \
OBD_FREE_PRE(ptr, size, "vfreed"); \
POISON(ptr, 0x5a, size); \
-
vfree(ptr);
\
+
libcfs_vfree_atomic(ptr);
\
POISON_PTR(ptr); \
} else { \
OBD_FREE(ptr, size); \
POISON_PTR(ptr); \
} else { \
OBD_FREE(ptr, size); \
@@
-982,28
+992,28
@@
static inline int lustre_to_lma_flags(__u32 la_flags)
* versions. These flags are set/cleared via FSFILT_IOC_{GET,SET}_FLAGS.
* See b=16526 for a full history.
*/
* versions. These flags are set/cleared via FSFILT_IOC_{GET,SET}_FLAGS.
* See b=16526 for a full history.
*/
-static inline int ll_ext_to_inode_flags(int flags)
+static inline int ll_ext_to_inode_flags(int
ext_
flags)
{
{
- return (((flags & LUSTRE_SYNC_FL) ? S_SYNC : 0) |
- ((flags & LUSTRE_NOATIME_FL) ? S_NOATIME : 0) |
- ((flags & LUSTRE_APPEND_FL) ? S_APPEND : 0) |
- ((flags & LUSTRE_DIRSYNC_FL) ? S_DIRSYNC : 0) |
+ return (((
ext_
flags & LUSTRE_SYNC_FL) ? S_SYNC : 0) |
+ ((
ext_
flags & LUSTRE_NOATIME_FL) ? S_NOATIME : 0) |
+ ((
ext_
flags & LUSTRE_APPEND_FL) ? S_APPEND : 0) |
+ ((
ext_
flags & LUSTRE_DIRSYNC_FL) ? S_DIRSYNC : 0) |
#if defined(S_ENCRYPTED)
#if defined(S_ENCRYPTED)
- ((flags & LUSTRE_ENCRYPT_FL) ? S_ENCRYPTED : 0) |
+ ((
ext_
flags & LUSTRE_ENCRYPT_FL) ? S_ENCRYPTED : 0) |
#endif
#endif
- ((flags & LUSTRE_IMMUTABLE_FL) ? S_IMMUTABLE : 0));
+ ((
ext_
flags & LUSTRE_IMMUTABLE_FL) ? S_IMMUTABLE : 0));
}
}
-static inline int ll_inode_to_ext_flags(int iflags)
+static inline int ll_inode_to_ext_flags(int i
node_
flags)
{
{
- return (((iflags & S_SYNC) ? LUSTRE_SYNC_FL : 0) |
- ((iflags & S_NOATIME) ? LUSTRE_NOATIME_FL : 0) |
- ((iflags & S_APPEND) ? LUSTRE_APPEND_FL : 0) |
- ((iflags & S_DIRSYNC) ? LUSTRE_DIRSYNC_FL : 0) |
+ return (((i
node_
flags & S_SYNC) ? LUSTRE_SYNC_FL : 0) |
+ ((i
node_
flags & S_NOATIME) ? LUSTRE_NOATIME_FL : 0) |
+ ((i
node_
flags & S_APPEND) ? LUSTRE_APPEND_FL : 0) |
+ ((i
node_
flags & S_DIRSYNC) ? LUSTRE_DIRSYNC_FL : 0) |
#if defined(S_ENCRYPTED)
#if defined(S_ENCRYPTED)
- ((iflags & S_ENCRYPTED) ? LUSTRE_ENCRYPT_FL : 0) |
+ ((i
node_
flags & S_ENCRYPTED) ? LUSTRE_ENCRYPT_FL : 0) |
#endif
#endif
- ((iflags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0));
+ ((i
node_
flags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0));
}
struct obd_heat_instance {
}
struct obd_heat_instance {