diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-13 04:04:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-13 04:04:55 +0000 |
| commit | 549cabd12eb94fe9f8e6d641c0741b9d71c4112b (patch) | |
| tree | bb3de579068c34e48de10d58b067e4d5be568b0a | |
| parent | 8692723f791ed0dd60880f3d7d58605d8450bb36 (diff) | |
| parent | 656c22980a4feaab46e470df8b785b5135d9cc75 (diff) | |
| download | android_external_e2fsprogs-549cabd12eb94fe9f8e6d641c0741b9d71c4112b.tar.gz android_external_e2fsprogs-549cabd12eb94fe9f8e6d641c0741b9d71c4112b.tar.bz2 android_external_e2fsprogs-549cabd12eb94fe9f8e6d641c0741b9d71c4112b.zip | |
Snap for 5304721 from 656c22980a4feaab46e470df8b785b5135d9cc75 to qt-release
Change-Id: I5baaed79eb12d80eccd81d4fde6828f416ca61d5
| -rw-r--r-- | misc/create_inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/create_inode.c b/misc/create_inode.c index 05aa6363..7b3a8ee2 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -438,8 +438,8 @@ static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, ptr += blen; continue; } - err = ext2fs_file_lseek(e2_file, off + bpos, - EXT2_SEEK_SET, NULL); + err = ext2fs_file_llseek(e2_file, off + bpos, + EXT2_SEEK_SET, NULL); if (err) goto fail; while (blen > 0) { @@ -480,8 +480,8 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, if (hole < 0) return EXT2_ET_UNIMPLEMENTED; - data_blk = data & ~(fs->blocksize - 1); - hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); + data_blk = data & ~(off_t)(fs->blocksize - 1); + hole_blk = (hole + (fs->blocksize - 1)) & ~(off_t)(fs->blocksize - 1); err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, zerobuf); if (err) |