LU-13783 libcfs: support __vmalloc with only 2 args.

[fs/lustre-release.git] / lustre / include / obd_support.h

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index b871dad..f820c87 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -244,6 +244,7 @@ extern char obd_jobid_var[];
 #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
@@ -276,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_OI_ENOSPC                         0x19d
+#define OBD_FAIL_OSD_DOTDOT_ENOSPC                     0x19e
 
 #define OBD_FAIL_OFD_SET_OID                           0x1e0
 
@@ -343,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_RESTART_IO                 0x251
 
 #define OBD_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
@@ -450,6 +454,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_NET_ERROR_RPC          0x532
 
 #define OBD_FAIL_OBD_PING_NET            0x600
 /*     OBD_FAIL_OBD_LOG_CANCEL_NET      0x601 obsolete since 1.5 */
@@ -652,6 +657,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_OBJECT_MISS       0x1708
 
 /* MIGRATE */
 #define OBD_FAIL_MIGRATE_ENTRIES               0x1801
@@ -700,6 +706,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_PRECREATE_PAUSE           0x2108
 
 /* barrier */
 #define OBD_FAIL_MGS_BARRIER_READ_NET          0x2200
@@ -827,8 +834,7 @@ do {                                                                              \
 #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",           \
@@ -985,28 +991,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.
  */
-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)
-               ((flags & LUSTRE_ENCRYPT_FL)   ? S_ENCRYPTED : 0) |
+               ((ext_flags & LUSTRE_ENCRYPT_FL)   ? S_ENCRYPTED : 0) |
 #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 inode_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 (((inode_flags & S_SYNC)      ? LUSTRE_SYNC_FL      : 0) |
+               ((inode_flags & S_NOATIME)   ? LUSTRE_NOATIME_FL   : 0) |
+               ((inode_flags & S_APPEND)    ? LUSTRE_APPEND_FL    : 0) |
+               ((inode_flags & S_DIRSYNC)   ? LUSTRE_DIRSYNC_FL   : 0) |
 #if defined(S_ENCRYPTED)
-               ((iflags & S_ENCRYPTED) ? LUSTRE_ENCRYPT_FL   : 0) |
+               ((inode_flags & S_ENCRYPTED) ? LUSTRE_ENCRYPT_FL   : 0) |
 #endif
-               ((iflags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0));
+               ((inode_flags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0));
 }
 
 struct obd_heat_instance {