diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-12-11 10:30:30 +1100 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-12-11 10:30:30 +1100 |
| commit | 59d2f4ec0b9dff7b56da34541dffd3e676adf584 (patch) | |
| tree | 0f982d10b206f248f13de6ba48617e9bdae5e5f5 /convert/source-reiserfs.c | |
| parent | 3b9cf4c8cda0818e4d3f9892ece9f7d99de13b03 (diff) | |
| parent | 5b162a39be9dec46a22c815f43fc337b920b4252 (diff) | |
Update upstream source from tag 'upstream/4.19.1'
Update to upstream version '4.19.1'
with Debian dir 171bf4d92c150acf94e8e0a7633c4349c4e39ad6
Diffstat (limited to 'convert/source-reiserfs.c')
| -rw-r--r-- | convert/source-reiserfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c index e0b3b685..cc592f19 100644 --- a/convert/source-reiserfs.c +++ b/convert/source-reiserfs.c @@ -301,7 +301,7 @@ static int reiserfs_record_indirect_extent(reiserfs_filsys_t fs, u64 position, /* * Unlike btrfs inline extents, reiserfs can have multiple inline extents. - * This handles concatanating multiple tails into one inline extent + * This handles concatenating multiple tails into one inline extent * for insertion. */ static int reiserfs_record_direct_extent(reiserfs_filsys_t fs, __u64 position, @@ -493,10 +493,10 @@ static int reiserfs_copy_dirent(reiserfs_filsys_t fs, ret = reiserfs_copy_meta(fs, root, dirent_data->convert_flags, deh_dirid, deh_objectid, &type); if (ret) { + errno = -ret; error( - "an error occured while converting \"%.*s\", reiserfs key [%u %u]: %s", - (int)len, name, deh_dirid, deh_objectid, - strerror(-ret)); + "an error occured while converting \"%.*s\", reiserfs key [%u %u]: %m", + (int)len, name, deh_dirid, deh_objectid); return ret; } trans = btrfs_start_transaction(root, 1); @@ -564,7 +564,7 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root, }; /* The root directory's dirid in reiserfs points to an object - * that does't exist. In btrfs it's self-referential. + * that doens't exist. In btrfs it's self-referential. */ if (deh_dirid == REISERFS_ROOT_PARENT_OBJECTID) parent = objectid; |