aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ordered-data.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/ordered-data.c')
-rw-r--r--fs/btrfs/ordered-data.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index b52b2c4010c2..f2023ccb7cf6 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -67,7 +67,7 @@ static void ordered_data_tree_panic(struct inode *inode, int errno,
67{ 67{
68 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); 68 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
69 btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset " 69 btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset "
70 "%llu\n", (unsigned long long)offset); 70 "%llu\n", offset);
71} 71}
72 72
73/* 73/*
@@ -336,14 +336,12 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
336 *file_offset = dec_end; 336 *file_offset = dec_end;
337 if (dec_start > dec_end) { 337 if (dec_start > dec_end) {
338 printk(KERN_CRIT "bad ordering dec_start %llu end %llu\n", 338 printk(KERN_CRIT "bad ordering dec_start %llu end %llu\n",
339 (unsigned long long)dec_start, 339 dec_start, dec_end);
340 (unsigned long long)dec_end);
341 } 340 }
342 to_dec = dec_end - dec_start; 341 to_dec = dec_end - dec_start;
343 if (to_dec > entry->bytes_left) { 342 if (to_dec > entry->bytes_left) {
344 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n", 343 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n",
345 (unsigned long long)entry->bytes_left, 344 entry->bytes_left, to_dec);
346 (unsigned long long)to_dec);
347 } 345 }
348 entry->bytes_left -= to_dec; 346 entry->bytes_left -= to_dec;
349 if (!uptodate) 347 if (!uptodate)
@@ -403,8 +401,7 @@ have_entry:
403 401
404 if (io_size > entry->bytes_left) { 402 if (io_size > entry->bytes_left) {
405 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n", 403 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n",
406 (unsigned long long)entry->bytes_left, 404 entry->bytes_left, io_size);
407 (unsigned long long)io_size);
408 } 405 }
409 entry->bytes_left -= io_size; 406 entry->bytes_left -= io_size;
410 if (!uptodate) 407 if (!uptodate)