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 /file.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 'file.c')
| -rw-r--r-- | file.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -178,7 +178,7 @@ out: * 3) data read out is also aligned to sectorsize, not truncated to inode size * * Return < 0 for fatal error during read. - * Otherwise return the number of succesfully read data in bytes. + * Otherwise return the number of successfully read data in bytes. */ int btrfs_read_file(struct btrfs_root *root, u64 ino, u64 start, int len, char *dest) @@ -255,8 +255,7 @@ int btrfs_read_file(struct btrfs_root *root, u64 ino, u64 start, int len, /* Inline extent, one inode should only one inline extent */ if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { - extent_len = btrfs_file_extent_inline_len(leaf, slot, - fi); + extent_len = btrfs_file_extent_ram_bytes(leaf, fi); if (extent_start + extent_len <= start) goto next; read_extent_buffer(leaf, dest, @@ -302,7 +301,7 @@ next: /* * Special trick for no_holes, since for no_holes we don't have good - * method to account skipped and tailling holes, we used + * method to account skipped and tailing holes, we used * min(inode size, len) as return value */ if (no_holes) { |