Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: knorrie/python-btrfs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: be0f305f45b982fd69abd6f115d865fc531decfe
Choose a base ref
..
head repository: knorrie/python-btrfs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e875c3d60b7848f393087aaa1c297c995fca6cf0
Choose a head ref
Showing with 11 additions and 11 deletions.
  1. +1 −1 bin/btrfs-search-metadata
  2. +5 −5 btrfs/ctree.py
  3. +1 −1 btrfs/fs_usage.py
  4. +1 −1 btrfs/ioctl.py
  5. +2 −2 btrfs/utils.py
  6. +1 −1 man/btrfs-balance-least-used.1
2 changes: 1 addition & 1 deletion bin/btrfs-search-metadata
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ presets = {
),
'devices': (get_devices, args_default, "Display devices"),
'orphans': (get_orphans, args_default, "Orphan items from the Root Tree"),
'dump': (dump, args_dump, "Dump aribitrary ranges of metadata items"),
'dump': (dump, args_dump, "Dump arbitrary ranges of metadata items"),
'block_group_contents': (
get_block_group_contents,
args_block_group_contents,
10 changes: 5 additions & 5 deletions btrfs/ctree.py
Original file line number Diff line number Diff line change
@@ -408,7 +408,7 @@ def _key_str_objectid(objectid_str, _type):
if match is not None:
return _qgroup_objectid(**match.groupdict())
else:
raise ValueError("Unparseable key objectid {} for qgroup type {}".format(
raise ValueError("Unparsable key objectid {} for qgroup type {}".format(
objectid_str, _key_type_str(_type)))
# is it some UUID hex string?
if objectid_str.startswith('0x'):
@@ -417,7 +417,7 @@ def _key_str_objectid(objectid_str, _type):
except Exception:
pass
# otherwise, we don't know
raise ValueError("Unparseable key objectid {}".format(objectid_str))
raise ValueError("Unparsable key objectid {}".format(objectid_str))


_key_type_str_map = {
@@ -510,7 +510,7 @@ def _key_str_offset(offset_str, _type):
if match is not None:
return _qgroup_objectid(**{k: int(v) for k, v in match.groupdict().items()})
else:
raise ValueError("Unparseable key offset {} for qgroup type {}".format(
raise ValueError("Unparsable key offset {} for qgroup type {}".format(
offset_str, _key_type_str(_type)))
# is it some UUID hex string?
if offset_str.startswith('0x'):
@@ -519,7 +519,7 @@ def _key_str_offset(offset_str, _type):
except Exception:
pass
# otherwise, we don't know
raise ValueError("Unparseable key offset {}".format(offset_str))
raise ValueError("Unparsable key offset {}".format(offset_str))


class ItemNotFoundError(IndexError):
@@ -578,7 +578,7 @@ class Key(object):
'(-1 255 -1)'
The `-1` value in the string representation is just a convenience way to
write the maximum allowed number. The actual value for a 64 bit numer is
write the maximum allowed number. The actual value for a 64 bit number is
still 18446744073709551615, and for 8 bit that's 255 of course.
For example, when setting up a minimum and maximum key for a metadata
2 changes: 1 addition & 1 deletion btrfs/fs_usage.py
Original file line number Diff line number Diff line change
@@ -585,7 +585,7 @@ def __init__(self, fs, data_metadata_ratio=None,
# For convenience reasons, we provide a few more derived numbers...
#
# If the soft unallocatable amount of bytes is higher than the hard
# amount, we can reclaim space by balancing the filesytsem.
# amount, we can reclaim space by balancing the filesystem.
self.unallocatable_reclaimable = \
max(self.unallocatable_soft - self.unallocatable_hard, 0)
for dev_usage in self.dev_usage.values():
2 changes: 1 addition & 1 deletion btrfs/ioctl.py
Original file line number Diff line number Diff line change
@@ -580,7 +580,7 @@ def logical_to_ino_v2(*args, **kwargs):
Backwards compatibility function. Use
:func:`~btrfs.ioctl.logical_ino_v2` instead.
"""
return logical_ino(*args, **kwargs)
return logical_ino_v2(*args, **kwargs)


def _logical_ino(fd, vaddr, bufsize=4096, ignore_offset=False, _v2=True):
4 changes: 2 additions & 2 deletions btrfs/utils.py
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
# along with python-btrfs. If not, see <http://www.gnu.org/licenses/>.

"""
This module contains miscellanious collection of things, like the
This module contains miscellaneous collection of things, like the
:func:`pretty_print` function which provides a quick readable textual dump of
most of the object types in this library. Besides that, some functions to
pretty print and parse size strings and some other stuff.
@@ -409,7 +409,7 @@ def embedded_text_for_str(text):
:rtype: str
This function is not intended to be used for anything else than a
convienient way of displaying filenames and xattr keys and values in the
convenient way of displaying filenames and xattr keys and values in the
pretty printer.
Example::
2 changes: 1 addition & 1 deletion man/btrfs-balance-least-used.1
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ already existing block groups.

What btrfs balance effectively does is just taking the data and feeding it back
to the allocator of the filesystem as new writes, blacklisting their current
location. Implementing user space balance filters can result in a higly
location. Implementing user space balance filters can result in a highly
optimized workflow to reclaim physical space, or to minimize the amount of data
that has to be rewritten to rebalance complex filesystems with multiple
devices.