openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sheepdog: reload only header in a case of live snapshot 

sheepdog driver doesn't need to read data_vdi_id[] when a live snapshot is
created.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Liu Yuan <namei.unix@gmail.com>
Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Hitoshi Mitake 2014-06-06 13:35:12 +09:00 committed by Stefan Hajnoczi
parent b544c1aba8
commit 5d039baba4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/sheepdog.c
View File

@ -200,6 +200,8 @@ typedef struct SheepdogInode {
uint32_t data_vdi_id[MAX_DATA_OBJS]; uint32_t data_vdi_id[MAX_DATA_OBJS];
} SheepdogInode; } SheepdogInode;
#define SD_INODE_HEADER_SIZE offsetof(SheepdogInode, data_vdi_id)
/* /*
* 64 bit FNV-1a non-zero initial basis * 64 bit FNV-1a non-zero initial basis
*/ */
@ -1287,7 +1289,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag)
return -EIO; return -EIO;
} }
inode = g_malloc(sizeof(s->inode)); inode = g_malloc(SD_INODE_HEADER_SIZE);
ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err); ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err);
if (ret) { if (ret) {
@ -1297,13 +1299,14 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag)
} }
ret = read_object(fd, s->aio_context, (char *)inode, vid_to_vdi_oid(vid), ret = read_object(fd, s->aio_context, (char *)inode, vid_to_vdi_oid(vid),
s->inode.nr_copies, sizeof(*inode), 0, s->cache_flags); s->inode.nr_copies, SD_INODE_HEADER_SIZE, 0,
s->cache_flags);
if (ret < 0) { if (ret < 0) {
goto out; goto out;
} }
if (inode->vdi_id != s->inode.vdi_id) { if (inode->vdi_id != s->inode.vdi_id) {
memcpy(&s->inode, inode, sizeof(s->inode)); memcpy(&s->inode, inode, SD_INODE_HEADER_SIZE);
} }
out: out: