File tree Expand file tree Collapse file tree 4 files changed +8
-62
lines changed Expand file tree Collapse file tree 4 files changed +8
-62
lines changed Original file line number Diff line number Diff line change @@ -7146,27 +7146,6 @@ fil_mtr_rename_log(
7146
7146
return (err);
7147
7147
}
7148
7148
7149
- /* ***************************************************************/ /* *
7150
- Acquire fil_system mutex */
7151
- void
7152
- fil_system_enter (void )
7153
- /* ==================*/
7154
- {
7155
- ut_ad (!mutex_own (&fil_system->mutex ));
7156
- mutex_enter (&fil_system->mutex );
7157
- }
7158
-
7159
- /* ***************************************************************/ /* *
7160
- Release fil_system mutex */
7161
- void
7162
- fil_system_exit (void )
7163
- /* =================*/
7164
- {
7165
- ut_ad (mutex_own (&fil_system->mutex ));
7166
- mutex_exit (&fil_system->mutex );
7167
- }
7168
-
7169
-
7170
7149
/* *****************************************************************
7171
7150
Get id of first tablespace or ULINT_UNDEFINED if none */
7172
7151
UNIV_INTERN
Original file line number Diff line number Diff line change @@ -1290,16 +1290,10 @@ fil_space_get(
1290
1290
ulint id); /* !< in: space id */
1291
1291
#endif /* !UNIV_INNOCHECKSUM */
1292
1292
1293
- /* ***************************************************************/ /* *
1294
- Acquire fil_system mutex */
1295
- void
1296
- fil_system_enter (void );
1297
- /* ==================*/
1298
- /* ***************************************************************/ /* *
1299
- Release fil_system mutex */
1300
- void
1301
- fil_system_exit (void );
1302
- /* ==================*/
1293
+ /* * Acquire the fil_system mutex. */
1294
+ #define fil_system_enter () mutex_enter(&fil_system->mutex)
1295
+ /* * Release the fil_system mutex. */
1296
+ #define fil_system_exit () mutex_exit(&fil_system->mutex)
1303
1297
1304
1298
#ifndef UNIV_INNOCHECKSUM
1305
1299
/* ******************************************************************/ /* *
Original file line number Diff line number Diff line change @@ -7260,27 +7260,6 @@ fil_space_set_corrupt(
7260
7260
mutex_exit (&fil_system->mutex );
7261
7261
}
7262
7262
7263
- /* ***************************************************************/ /* *
7264
- Acquire fil_system mutex */
7265
- void
7266
- fil_system_enter (void )
7267
- /* ==================*/
7268
- {
7269
- ut_ad (!mutex_own (&fil_system->mutex ));
7270
- mutex_enter (&fil_system->mutex );
7271
- }
7272
-
7273
- /* ***************************************************************/ /* *
7274
- Release fil_system mutex */
7275
- void
7276
- fil_system_exit (void )
7277
- /* =================*/
7278
- {
7279
- ut_ad (mutex_own (&fil_system->mutex ));
7280
- mutex_exit (&fil_system->mutex );
7281
- }
7282
-
7283
-
7284
7263
/* *****************************************************************
7285
7264
Get id of first tablespace or ULINT_UNDEFINED if none */
7286
7265
UNIV_INTERN
Original file line number Diff line number Diff line change @@ -1314,16 +1314,10 @@ fil_space_set_corrupt(
1314
1314
/* ==================*/
1315
1315
ulint space_id);
1316
1316
1317
- /* ***************************************************************/ /* *
1318
- Acquire fil_system mutex */
1319
- void
1320
- fil_system_enter (void );
1321
- /* ==================*/
1322
- /* ***************************************************************/ /* *
1323
- Release fil_system mutex */
1324
- void
1325
- fil_system_exit (void );
1326
- /* ==================*/
1317
+ /* * Acquire the fil_system mutex. */
1318
+ #define fil_system_enter () mutex_enter(&fil_system->mutex)
1319
+ /* * Release the fil_system mutex. */
1320
+ #define fil_system_exit () mutex_exit(&fil_system->mutex)
1327
1321
1328
1322
#ifndef UNIV_INNOCHECKSUM
1329
1323
/* ******************************************************************/ /* *
You can’t perform that action at this time.
0 commit comments