diff options
Diffstat (limited to 'e2fsprogs/ext2fs/ext2fs_inline.c')
-rw-r--r-- | e2fsprogs/ext2fs/ext2fs_inline.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/ext2fs/ext2fs_inline.c index 1202b3526..07805b10d 100644 --- a/e2fsprogs/ext2fs/ext2fs_inline.c +++ b/e2fsprogs/ext2fs/ext2fs_inline.c | |||
@@ -238,78 +238,36 @@ int ext2fs_test_inode_bitmap(ext2fs_inode_bitmap bitmap, | |||
238 | void ext2fs_fast_mark_block_bitmap(ext2fs_block_bitmap bitmap, | 238 | void ext2fs_fast_mark_block_bitmap(ext2fs_block_bitmap bitmap, |
239 | blk_t block) | 239 | blk_t block) |
240 | { | 240 | { |
241 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
242 | if ((block < bitmap->start) || (block > bitmap->end)) { | ||
243 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block, | ||
244 | bitmap->description); | ||
245 | return; | ||
246 | } | ||
247 | #endif | ||
248 | ext2fs_set_bit(block - bitmap->start, bitmap->bitmap); | 241 | ext2fs_set_bit(block - bitmap->start, bitmap->bitmap); |
249 | } | 242 | } |
250 | 243 | ||
251 | void ext2fs_fast_unmark_block_bitmap(ext2fs_block_bitmap bitmap, | 244 | void ext2fs_fast_unmark_block_bitmap(ext2fs_block_bitmap bitmap, |
252 | blk_t block) | 245 | blk_t block) |
253 | { | 246 | { |
254 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
255 | if ((block < bitmap->start) || (block > bitmap->end)) { | ||
256 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK, | ||
257 | block, bitmap->description); | ||
258 | return; | ||
259 | } | ||
260 | #endif | ||
261 | ext2fs_clear_bit(block - bitmap->start, bitmap->bitmap); | 247 | ext2fs_clear_bit(block - bitmap->start, bitmap->bitmap); |
262 | } | 248 | } |
263 | 249 | ||
264 | int ext2fs_fast_test_block_bitmap(ext2fs_block_bitmap bitmap, | 250 | int ext2fs_fast_test_block_bitmap(ext2fs_block_bitmap bitmap, |
265 | blk_t block) | 251 | blk_t block) |
266 | { | 252 | { |
267 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
268 | if ((block < bitmap->start) || (block > bitmap->end)) { | ||
269 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, | ||
270 | block, bitmap->description); | ||
271 | return 0; | ||
272 | } | ||
273 | #endif | ||
274 | return ext2fs_test_bit(block - bitmap->start, bitmap->bitmap); | 253 | return ext2fs_test_bit(block - bitmap->start, bitmap->bitmap); |
275 | } | 254 | } |
276 | 255 | ||
277 | void ext2fs_fast_mark_inode_bitmap(ext2fs_inode_bitmap bitmap, | 256 | void ext2fs_fast_mark_inode_bitmap(ext2fs_inode_bitmap bitmap, |
278 | ext2_ino_t inode) | 257 | ext2_ino_t inode) |
279 | { | 258 | { |
280 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
281 | if ((inode < bitmap->start) || (inode > bitmap->end)) { | ||
282 | ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_MARK, | ||
283 | inode, bitmap->description); | ||
284 | return; | ||
285 | } | ||
286 | #endif | ||
287 | ext2fs_set_bit(inode - bitmap->start, bitmap->bitmap); | 259 | ext2fs_set_bit(inode - bitmap->start, bitmap->bitmap); |
288 | } | 260 | } |
289 | 261 | ||
290 | void ext2fs_fast_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap, | 262 | void ext2fs_fast_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap, |
291 | ext2_ino_t inode) | 263 | ext2_ino_t inode) |
292 | { | 264 | { |
293 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
294 | if ((inode < bitmap->start) || (inode > bitmap->end)) { | ||
295 | ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_UNMARK, | ||
296 | inode, bitmap->description); | ||
297 | return; | ||
298 | } | ||
299 | #endif | ||
300 | ext2fs_clear_bit(inode - bitmap->start, bitmap->bitmap); | 265 | ext2fs_clear_bit(inode - bitmap->start, bitmap->bitmap); |
301 | } | 266 | } |
302 | 267 | ||
303 | int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap, | 268 | int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap, |
304 | ext2_ino_t inode) | 269 | ext2_ino_t inode) |
305 | { | 270 | { |
306 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
307 | if ((inode < bitmap->start) || (inode > bitmap->end)) { | ||
308 | ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST, | ||
309 | inode, bitmap->description); | ||
310 | return 0; | ||
311 | } | ||
312 | #endif | ||
313 | return ext2fs_test_bit(inode - bitmap->start, bitmap->bitmap); | 271 | return ext2fs_test_bit(inode - bitmap->start, bitmap->bitmap); |
314 | } | 272 | } |
315 | 273 | ||
@@ -355,13 +313,6 @@ int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap, | |||
355 | { | 313 | { |
356 | int i; | 314 | int i; |
357 | 315 | ||
358 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
359 | if ((block < bitmap->start) || (block+num-1 > bitmap->end)) { | ||
360 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, | ||
361 | block, bitmap->description); | ||
362 | return 0; | ||
363 | } | ||
364 | #endif | ||
365 | for (i=0; i < num; i++) { | 316 | for (i=0; i < num; i++) { |
366 | if (ext2fs_fast_test_block_bitmap(bitmap, block+i)) | 317 | if (ext2fs_fast_test_block_bitmap(bitmap, block+i)) |
367 | return 0; | 318 | return 0; |
@@ -388,13 +339,6 @@ void ext2fs_fast_mark_block_bitmap_range(ext2fs_block_bitmap bitmap, | |||
388 | { | 339 | { |
389 | int i; | 340 | int i; |
390 | 341 | ||
391 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
392 | if ((block < bitmap->start) || (block+num-1 > bitmap->end)) { | ||
393 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block, | ||
394 | bitmap->description); | ||
395 | return; | ||
396 | } | ||
397 | #endif | ||
398 | for (i=0; i < num; i++) | 342 | for (i=0; i < num; i++) |
399 | ext2fs_set_bit(block + i - bitmap->start, bitmap->bitmap); | 343 | ext2fs_set_bit(block + i - bitmap->start, bitmap->bitmap); |
400 | } | 344 | } |
@@ -417,14 +361,6 @@ void ext2fs_fast_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap, | |||
417 | blk_t block, int num) | 361 | blk_t block, int num) |
418 | { | 362 | { |
419 | int i; | 363 | int i; |
420 | |||
421 | #ifdef EXT2FS_DEBUG_FAST_OPS | ||
422 | if ((block < bitmap->start) || (block+num-1 > bitmap->end)) { | ||
423 | ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK, block, | ||
424 | bitmap->description); | ||
425 | return; | ||
426 | } | ||
427 | #endif | ||
428 | for (i=0; i < num; i++) | 364 | for (i=0; i < num; i++) |
429 | ext2fs_clear_bit(block + i - bitmap->start, bitmap->bitmap); | 365 | ext2fs_clear_bit(block + i - bitmap->start, bitmap->bitmap); |
430 | } | 366 | } |