d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/aio: make disk->size a local variable

Browse Source 
Disk size in bytes is only used within create_aio_disk(), so we don't
need to save it in the struct file_disk context structure.

Change-Id: I63d230448a67c2b49c57eac2b4d44dce27c303cf
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/373832
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2017-08-10 15:42:11 -07:00 committed by Jim Harris
parent 671179409c
commit 75efdc63be
2 changed files with 5 additions and 5 deletions

9
lib/bdev/aio/bdev_aio.c

@ -340,6 +340,7 @@ create_aio_disk(const char *name, const char *fname, uint32_t block_size)
{
struct file_disk *fdisk;
uint32_t detected_block_size;
uint64_t disk_size;
fdisk = calloc(sizeof(*fdisk), 1);
if (!fdisk) {
@ -353,7 +354,7 @@ create_aio_disk(const char *name, const char *fname, uint32_t block_size)
goto error_return;
}
fdisk->size = spdk_fd_get_size(fdisk->fd);
disk_size = spdk_fd_get_size(fdisk->fd);
TAILQ_INIT(&fdisk->sync_completion_list);
fdisk->disk.name = strdup(name);
@ -399,13 +400,13 @@ create_aio_disk(const char *name, const char *fname, uint32_t block_size)
fdisk->disk.blocklen = block_size;
if (fdisk->size % fdisk->disk.blocklen != 0) {
if (disk_size % fdisk->disk.blocklen != 0) {
SPDK_ERRLOG("Disk size %" PRIu64 " is not a multiple of block size %" PRIu32 "\n",
fdisk->size, fdisk->disk.blocklen);
disk_size, fdisk->disk.blocklen);
goto error_return;
}
fdisk->disk.blockcnt = fdisk->size / fdisk->disk.blocklen;
fdisk->disk.blockcnt = disk_size / fdisk->disk.blocklen;
fdisk->disk.ctxt = fdisk;
fdisk->disk.fn_table = &aio_fn_table;

1
lib/bdev/aio/bdev_aio.h

@ -58,7 +58,6 @@ struct file_disk {
struct spdk_bdev disk;
const char *file;
int fd;
uint64_t size;
/**
* For storing I/O that were completed synchronously, and will be