ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sheepdog: cleanup repeated expression 

The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a macro
defined for the same value (though with a nicer definition using offsetof).
Replace it.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180523160721.14018-2-pbonzini@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-05-23 18:07:20 +02:00 committed by Jeff Cody
parent 41feb5b955
commit 03b036cc0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/sheepdog.c
View File

@ -2335,7 +2335,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
} }
/* we don't need to update entire object */ /* we don't need to update entire object */
datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id); datalen = SD_INODE_HEADER_SIZE;
s->inode.vdi_size = offset; s->inode.vdi_size = offset;
ret = write_object(fd, s->bs, (char *)&s->inode, ret = write_object(fd, s->bs, (char *)&s->inode,
vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies, vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
@ -2703,7 +2703,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
*/ */
strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag)); strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
/* we don't need to update entire object */ /* we don't need to update entire object */
datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id); datalen = SD_INODE_HEADER_SIZE;
inode = g_malloc(datalen); inode = g_malloc(datalen);
/* refresh inode. */ /* refresh inode. */
@ -2989,7 +2989,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
/* we don't need to read entire object */ /* we don't need to read entire object */
ret = read_object(fd, s->bs, (char *)&inode, ret = read_object(fd, s->bs, (char *)&inode,
vid_to_vdi_oid(vid), vid_to_vdi_oid(vid),
0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0, 0, SD_INODE_HEADER_SIZE, 0,
s->cache_flags); s->cache_flags);
if (ret) { if (ret) {