LU-9555 quota: df should return projid-specific values

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

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 52960d8..847c443 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -271,10 +271,9 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OSD_OST_EA_FID_SET                    0x197
 #define OBD_FAIL_OSD_NO_OI_ENTRY                       0x198
 #define OBD_FAIL_OSD_INDEX_CRASH                       0x199
-
 #define OBD_FAIL_OSD_TXN_START                         0x19a
-
 #define OBD_FAIL_OSD_DUPLICATE_MAP                     0x19b
+#define OBD_FAIL_OSD_REF_DEL                           0x19c
 
 #define OBD_FAIL_OFD_SET_OID                           0x1e0
 
@@ -340,6 +339,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_PREPARE_DELAY      0x247
 #define OBD_FAIL_OST_2BIG_NIOBUF        0x248
 #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_LDLM                    0x300
@@ -388,6 +388,7 @@ 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_LOCK_REPLAY       0x32d
 
 /* LOCKLESS IO */
 #define OBD_FAIL_LDLM_SET_CONTENTION     0x385
@@ -487,6 +488,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_TGT_RECOVERY_REQ_RACE  0x721
 #define OBD_FAIL_TGT_REPLY_DATA_RACE    0x722
 #define OBD_FAIL_TGT_RECOVERY_CONNECT    0x724
+#define OBD_FAIL_TGT_NO_GRANT           0x725
 
 #define OBD_FAIL_MDC_REVALIDATE_PAUSE    0x800
 #define OBD_FAIL_MDC_ENQUEUE_PAUSE       0x801
@@ -582,6 +584,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_LLITE_PCC_MKWRITE_PAUSE           0x1413
 #define OBD_FAIL_LLITE_PCC_ATTACH_PAUSE                    0x1414
 #define OBD_FAIL_LLITE_SHORT_COMMIT                0x1415
+#define OBD_FAIL_LLITE_CREATE_FILE_PAUSE2          0x1416
 
 #define OBD_FAIL_FID_INDIR     0x1501
 #define OBD_FAIL_FID_INLMA     0x1502
@@ -646,6 +649,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_LARGE_STRIPE          0x1703
 #define OBD_FAIL_OUT_ENOSPC             0x1704
 #define OBD_FAIL_INVALIDATE_UPDATE     0x1705
+#define OBD_FAIL_OUT_UPDATE_DROP        0x1707
 
 /* MIGRATE */
 #define OBD_FAIL_MIGRATE_ENTRIES               0x1801
@@ -693,6 +697,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OSP_RPCS_SEM                  0x2104
 #define OBD_FAIL_OSP_CANT_PROCESS_LLOG         0x2105
 #define OBD_FAIL_OSP_INVALID_LOGID             0x2106
+#define OBD_FAIL_OSP_CON_EVENT_DELAY           0x2107
 
 /* barrier */
 #define OBD_FAIL_MGS_BARRIER_READ_NET          0x2200
@@ -723,7 +728,7 @@ extern char obd_jobid_var[];
 #define LUT_FAIL_MDT                           LUT_FAIL_CLASS(OBD_FAIL_MDS)
 #define LUT_FAIL_OST                           LUT_FAIL_CLASS(OBD_FAIL_OST)
 
-extern atomic_t libcfs_kmemory;
+extern atomic64_t libcfs_kmem;
 
 #ifdef CONFIG_PROC_FS
 #define obd_memory_add(size)                                                  \
@@ -826,8 +831,8 @@ do {                                                                              \
        if (unlikely((ptr) == NULL)) {                                        \
                CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n",           \
                       (int)(size));                                          \
-               CERROR("%llu total bytes allocated by Lustre, %d by LNET\n", \
-                      obd_memory_sum(), atomic_read(&libcfs_kmemory));       \
+               CERROR("%llu total bytes allocated by Lustre, %lld by LNET\n",\
+                      obd_memory_sum(), libcfs_kmem_read());\
        } else {                                                              \
                OBD_ALLOC_POST(ptr, size, "vmalloced");                       \
        }                                                                     \
@@ -887,7 +892,7 @@ do {                                                                              \
        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);                                          \