diff options
Diffstat (limited to 'fs/btrfs/qgroup.c')
-rw-r--r-- | fs/btrfs/qgroup.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 66c58e120b2c..4e6ef490619e 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -398,8 +398,7 @@ next1: | |||
398 | if (ret == -ENOENT) { | 398 | if (ret == -ENOENT) { |
399 | printk(KERN_WARNING | 399 | printk(KERN_WARNING |
400 | "btrfs: orphan qgroup relation 0x%llx->0x%llx\n", | 400 | "btrfs: orphan qgroup relation 0x%llx->0x%llx\n", |
401 | (unsigned long long)found_key.objectid, | 401 | found_key.objectid, found_key.offset); |
402 | (unsigned long long)found_key.offset); | ||
403 | ret = 0; /* ignore the error */ | 402 | ret = 0; /* ignore the error */ |
404 | } | 403 | } |
405 | if (ret) | 404 | if (ret) |
@@ -1163,7 +1162,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, | |||
1163 | if (ret) { | 1162 | if (ret) { |
1164 | fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; | 1163 | fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; |
1165 | printk(KERN_INFO "unable to update quota limit for %llu\n", | 1164 | printk(KERN_INFO "unable to update quota limit for %llu\n", |
1166 | (unsigned long long)qgroupid); | 1165 | qgroupid); |
1167 | } | 1166 | } |
1168 | 1167 | ||
1169 | spin_lock(&fs_info->qgroup_lock); | 1168 | spin_lock(&fs_info->qgroup_lock); |
@@ -1873,10 +1872,9 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path, | |||
1873 | path, 1, 0); | 1872 | path, 1, 0); |
1874 | 1873 | ||
1875 | pr_debug("current progress key (%llu %u %llu), search_slot ret %d\n", | 1874 | pr_debug("current progress key (%llu %u %llu), search_slot ret %d\n", |
1876 | (unsigned long long)fs_info->qgroup_rescan_progress.objectid, | 1875 | fs_info->qgroup_rescan_progress.objectid, |
1877 | fs_info->qgroup_rescan_progress.type, | 1876 | fs_info->qgroup_rescan_progress.type, |
1878 | (unsigned long long)fs_info->qgroup_rescan_progress.offset, | 1877 | fs_info->qgroup_rescan_progress.offset, ret); |
1879 | ret); | ||
1880 | 1878 | ||
1881 | if (ret) { | 1879 | if (ret) { |
1882 | /* | 1880 | /* |