* [PATCH] mmap engine: remove unused variable mmap_map_mask
@ 2016-12-02 23:59 Ross Zwisler
0 siblings, 0 replies; only message in thread
From: Ross Zwisler @ 2016-12-02 23:59 UTC (permalink / raw)
To: fio, jens.axboe; +Cc: Ross Zwisler
The global variable 'mmap_map_mask' was introduced in this commit:
commit ac8931124126 ("mmap engine: allow large files on 32-bit archs")
and was used in fio_mmapio_prep() to calculate f->mmap_off. This usage was
removed in this commit:
commit ff455a04f4e7 ("mmap engine: fix for large files on 32-bit archs")
but the definition and setup code for 'mmap_map_mask' were left intact.
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
---
engines/mmap.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/engines/mmap.c b/engines/mmap.c
index 14e4013..c479ed3 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -20,7 +20,6 @@
#define MMAP_TOTAL_SZ (1 * 1024 * 1024 * 1024UL)
static unsigned long mmap_map_size;
-static unsigned long mmap_map_mask;
struct fio_mmap_data {
void *mmap_ptr;
@@ -72,7 +71,6 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
(void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
#endif
-
err:
if (td->error && fmd->mmap_ptr)
munmap(fmd->mmap_ptr, length);
@@ -208,26 +206,15 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
static int fio_mmapio_init(struct thread_data *td)
{
struct thread_options *o = &td->o;
- unsigned long shift, mask;
- if ((td->o.rw_min_bs & page_mask) &&
+ if ((o->rw_min_bs & page_mask) &&
(o->odirect || o->fsync_blocks || o->fdatasync_blocks)) {
log_err("fio: mmap options dictate a minimum block size of "
"%llu bytes\n", (unsigned long long) page_size);
return 1;
}
- mmap_map_size = MMAP_TOTAL_SZ / td->o.nr_files;
- mask = mmap_map_size;
- shift = 0;
- do {
- mask >>= 1;
- if (!mask)
- break;
- shift++;
- } while (1);
-
- mmap_map_mask = 1UL << shift;
+ mmap_map_size = MMAP_TOTAL_SZ / o->nr_files;
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-03 0:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-02 23:59 [PATCH] mmap engine: remove unused variable mmap_map_mask Ross Zwisler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.