diff mbox

[2/2] sheepdog: reload only header in a case of live snapshot

Message ID 1401721610-12920-3-git-send-email-mitake.hitoshi@gmail.com
State New
Headers show

Commit Message

Hitoshi Mitake June 2, 2014, 3:06 p.m. UTC 
sheepdog dirver 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>
---
 block/sheepdog.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Eric Blake June 2, 2014, 3:48 p.m. UTC | #1 
On 06/02/2014 09:06 AM, Hitoshi Mitake wrote:
> sheepdog dirver doesn't need to read data_vdi_id[] when a live

s/dirver/driver/

> snapshot is created.
>
Hitoshi Mitake June 3, 2014, 1:08 a.m. UTC | #2 
On Tue, Jun 3, 2014 at 12:48 AM, Eric Blake <eblake@redhat.com> wrote:
> On 06/02/2014 09:06 AM, Hitoshi Mitake wrote:
>> sheepdog dirver doesn't need to read data_vdi_id[] when a live
>
> s/dirver/driver/

Thanks for your comment. I'll send v2 later.

Thanks,
Hitoshi

>
>> snapshot is created.
>>
>
> --
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
>
diff mbox

Patch

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 8266382..06c4180 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -200,6 +200,8 @@  typedef struct SheepdogInode {
     uint32_t data_vdi_id[MAX_DATA_OBJS];
 } SheepdogInode;
 
+#define SD_INODE_HEADER_SIZE offsetof(SheepdogInode, data_vdi_id)
+
 /*
  * 64 bit FNV-1a non-zero initial basis
  */
@@ -1275,7 +1277,7 @@  static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag)
         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);
     if (ret) {
@@ -1283,13 +1285,14 @@  static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag)
     }
 
     ret = read_object(fd, (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) {
         goto out;
     }
 
     if (inode->vdi_id != s->inode.vdi_id) {
-        memcpy(&s->inode, inode, sizeof(s->inode));
+        memcpy(&s->inode, inode, SD_INODE_HEADER_SIZE);
     }
 
 out: