From: Jens Axboe Date: Fri, 4 Jan 2013 12:16:54 +0000 (+0100) Subject: Start of transition from unsigned long long to uint64_t X-Git-Tag: fio-2.0.13~7 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=293b8c1f23bbe4c735cd00fbb7cca1121bf18016 Start of transition from unsigned long long to uint64_t Signed-off-by: Jens Axboe --- diff --git a/file.h b/file.h index e57bebcf..4ecedc7b 100644 --- a/file.h +++ b/file.h @@ -84,15 +84,15 @@ struct fio_file { /* * size of the file, offset into file, and io size from that offset */ - unsigned long long real_file_size; - unsigned long long file_offset; - unsigned long long io_size; + uint64_t real_file_size; + uint64_t file_offset; + uint64_t io_size; - unsigned long long last_pos; - unsigned long long last_start; + uint64_t last_pos; + uint64_t last_start; - unsigned long long first_write; - unsigned long long last_write; + uint64_t first_write; + uint64_t last_write; /* * For use by the io engine @@ -154,7 +154,7 @@ FILE_FLAG_FNS(partial_mmap); struct thread_data; extern void close_files(struct thread_data *); extern void close_and_free_files(struct thread_data *); -extern unsigned long long get_start_offset(struct thread_data *); +extern uint64_t get_start_offset(struct thread_data *); extern int __must_check setup_files(struct thread_data *); extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *); extern int __must_check generic_open_file(struct thread_data *, struct fio_file *); diff --git a/filesetup.c b/filesetup.c index 41809093..b1ca9217 100644 --- a/filesetup.c +++ b/filesetup.c @@ -709,7 +709,7 @@ static unsigned long long get_fs_free_counts(struct thread_data *td) return ret; } -unsigned long long get_start_offset(struct thread_data *td) +uint64_t get_start_offset(struct thread_data *td) { return td->o.start_offset + (td->thread_number - 1) * td->o.offset_increment;