[sheepdog] [PATCH 2/3] sheep: fix cloning VDI fail when cloned VDI has greater nr_copies than the base

[levin li]

From: levin li <xingke....@taobao.com>


Signed-off-by: levin li <xingke....@taobao.com>
---
 sheep/vdi.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sheep/vdi.c b/sheep/vdi.c
index 5c9bf68..aa5134b 100644
--- a/sheep/vdi.c
+++ b/sheep/vdi.c
@@ -225,7 +225,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t 
new_vid,
 
        if (iocb->base_vid) {
                ret = read_object(vid_to_vdi_oid(iocb->base_vid), (char *)base,
-                                 sizeof(*base), 0, iocb->nr_copies);
+                                 sizeof(*base), 0, 0);
                if (ret != SD_RES_SUCCESS) {
                        ret = SD_RES_BASE_VDI_READ;
                        goto out;
@@ -240,7 +240,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t 
new_vid,
                                name, cur_vid, iocb->base_vid);
 
                        ret = read_object(vid_to_vdi_oid(cur_vid), (char *)cur,
-                                         SD_INODE_HEADER_SIZE, 0, 
iocb->nr_copies);
+                                         SD_INODE_HEADER_SIZE, 0, 0);
                        if (ret != SD_RES_SUCCESS) {
                                vprintf(SDOG_ERR, "failed\n");
                                ret = SD_RES_BASE_VDI_READ;
@@ -282,8 +282,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t 
new_vid,
 
        if (iocb->snapid && cur_vid != iocb->base_vid) {
                ret = write_object(vid_to_vdi_oid(cur_vid), (char *)cur,
-                                  SD_INODE_HEADER_SIZE, 0, 0, 0,
-                                  iocb->nr_copies);
+                                  SD_INODE_HEADER_SIZE, 0, 0, 0, 0);
                if (ret != 0) {
                        vprintf(SDOG_ERR, "failed\n");
                        ret = SD_RES_BASE_VDI_READ;
@@ -293,8 +292,7 @@ static int create_vdi_obj(struct vdi_iocb *iocb, uint32_t 
new_vid,
 
        if (iocb->base_vid) {
                ret = write_object(vid_to_vdi_oid(iocb->base_vid), (char *)base,
-                                  SD_INODE_HEADER_SIZE, 0, 0, 0,
-                                  iocb->nr_copies);
+                                  SD_INODE_HEADER_SIZE, 0, 0, 0, 0);
                if (ret != 0) {
                        vprintf(SDOG_ERR, "failed\n");
                        ret = SD_RES_BASE_VDI_WRITE;
-- 
1.7.1

-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog