projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'amlogic/for-next'
[deliverable/linux.git]
/
fs
/
btrfs
/
free-space-tree.c
diff --git
a/fs/btrfs/free-space-tree.c
b/fs/btrfs/free-space-tree.c
index 53dbeaf6ce941cc7a6a8bf06c6a81df354e9e364..87e7e3d3e6760ebb2b07ef73162ff1d83942d641 100644
(file)
--- a/
fs/btrfs/free-space-tree.c
+++ b/
fs/btrfs/free-space-tree.c
@@
-305,7
+305,7
@@
int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
out:
kvfree(bitmap);
if (ret)
out:
kvfree(bitmap);
if (ret)
- btrfs_abort_transaction(trans, r
oot, r
et);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
@@
-454,7
+454,7
@@
int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
out:
kvfree(bitmap);
if (ret)
out:
kvfree(bitmap);
if (ret)
- btrfs_abort_transaction(trans, r
oot, r
et);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
@@
-851,7
+851,7
@@
int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
out:
btrfs_free_path(path);
if (ret)
out:
btrfs_free_path(path);
if (ret)
- btrfs_abort_transaction(trans,
fs_info->free_space_root,
ret);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
@@
-1047,7
+1047,7
@@
int add_to_free_space_tree(struct btrfs_trans_handle *trans,
out:
btrfs_free_path(path);
if (ret)
out:
btrfs_free_path(path);
if (ret)
- btrfs_abort_transaction(trans,
fs_info->free_space_root,
ret);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
@@
-1193,7
+1193,7
@@
int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)
abort:
fs_info->creating_free_space_tree = 0;
abort:
fs_info->creating_free_space_tree = 0;
- btrfs_abort_transaction(trans,
tree_root,
ret);
+ btrfs_abort_transaction(trans, ret);
btrfs_end_transaction(trans, tree_root);
return ret;
}
btrfs_end_transaction(trans, tree_root);
return ret;
}
@@
-1280,7
+1280,7
@@
int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
return 0;
abort:
return 0;
abort:
- btrfs_abort_transaction(trans,
tree_root,
ret);
+ btrfs_abort_transaction(trans, ret);
btrfs_end_transaction(trans, tree_root);
return ret;
}
btrfs_end_transaction(trans, tree_root);
return ret;
}
@@
-1333,7
+1333,7
@@
out:
btrfs_free_path(path);
mutex_unlock(&block_group->free_space_lock);
if (ret)
btrfs_free_path(path);
mutex_unlock(&block_group->free_space_lock);
if (ret)
- btrfs_abort_transaction(trans,
fs_info->free_space_root,
ret);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
@@
-1410,7
+1410,7
@@
int remove_block_group_free_space(struct btrfs_trans_handle *trans,
out:
btrfs_free_path(path);
if (ret)
out:
btrfs_free_path(path);
if (ret)
- btrfs_abort_transaction(trans, r
oot, r
et);
+ btrfs_abort_transaction(trans, ret);
return ret;
}
return ret;
}
This page took
0.027568 seconds
and
5
git commands to generate.