From 48950167c2f5a72499cbb4307603b59a5c59664e Mon Sep 17 00:00:00 2001
From: yixiang-zhang <yx.zhang@seafile.com>
Date: Fri, 12 Jan 2018 17:18:06 +0800
Subject: [PATCH] fix commit block fs directory to be created

---
 common/block-backend-fs.c | 13 +------------
 common/obj-backend-fs.c   | 18 ------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/common/block-backend-fs.c b/common/block-backend-fs.c
index 29e2e06..f815a58 100644
--- a/common/block-backend-fs.c
+++ b/common/block-backend-fs.c
@@ -28,8 +28,6 @@ struct _BHandle {
 };
 
 typedef struct {
-    char          *v0_block_dir;
-    int            v0_block_dir_len;
     char          *block_dir;
     int            block_dir_len;
     char          *tmp_dir;
@@ -270,8 +268,6 @@ block_backend_fs_foreach_block (BlockBackend *bend,
 #if defined MIGRATION
     if (version > 0)
         block_dir = g_build_filename (priv->block_dir, store_id, NULL);
-    else
-        block_dir = g_strdup(priv->v0_block_dir);
 #else
     block_dir = g_build_filename (priv->block_dir, store_id, NULL);
 #endif
@@ -415,11 +411,7 @@ get_block_path (BlockBackend *bend,
     if (version > 0) {
         n = snprintf (path, SEAF_PATH_MAX, "%s/%s/", priv->block_dir, store_id);
         pos += n;
-    } else {
-        memcpy (pos, priv->v0_block_dir, priv->v0_block_dir_len);
-        pos[priv->v0_block_dir_len] = '/';
-        pos += priv->v0_block_dir_len + 1;
-    }
+    } else
 #else
     n = snprintf (path, SEAF_PATH_MAX, "%s/%s/", priv->block_dir, store_id);
     pos += n;
@@ -460,9 +452,6 @@ block_backend_fs_new (const char *seaf_dir, const char *tmp_dir)
     priv = g_new0(FsPriv, 1);
     bend->be_priv = priv;
 
-    priv->v0_block_dir = g_build_filename (seaf_dir, "blocks", NULL);
-    priv->v0_block_dir_len = strlen(priv->v0_block_dir);
-
     priv->block_dir = g_build_filename (seaf_dir, "storage", "blocks", NULL);
     priv->block_dir_len = strlen (priv->block_dir);
 
diff --git a/common/obj-backend-fs.c b/common/obj-backend-fs.c
index e0c5619..264cbcd 100644
--- a/common/obj-backend-fs.c
+++ b/common/obj-backend-fs.c
@@ -21,8 +21,6 @@
 #include "log.h"
 
 typedef struct FsPriv {
-    char *v0_obj_dir;
-    int v0_dir_len;
     char *obj_dir;
     int   dir_len;
 } FsPriv;
@@ -38,10 +36,6 @@ id_to_path (FsPriv *priv, const char *obj_id, char path[],
     if (version > 0) {
         n = snprintf (path, SEAF_PATH_MAX, "%s/%s/", priv->obj_dir, repo_id);
         pos += n;
-    } else {
-        memcpy (pos, priv->v0_obj_dir, priv->v0_dir_len);
-        pos[priv->v0_dir_len] = '/';
-        pos += priv->v0_dir_len + 1;
     }
 #else
     n = snprintf (path, SEAF_PATH_MAX, "%s/%s/", priv->obj_dir, repo_id);
@@ -372,8 +366,6 @@ obj_backend_fs_foreach_obj (ObjBackend *bend,
 #if defined MIGRATION || defined SEAFILE_CLIENT
     if (version > 0)
         obj_dir = g_build_filename (priv->obj_dir, repo_id, NULL);
-    else
-        obj_dir = g_strdup(priv->v0_obj_dir);
 #else
     obj_dir = g_build_filename (priv->obj_dir, repo_id, NULL);
 #endif
@@ -512,18 +504,9 @@ obj_backend_fs_new (const char *seaf_dir, const char *obj_type)
     priv = g_new0(FsPriv, 1);
     bend->priv = priv;
 
-    priv->v0_obj_dir = g_build_filename (seaf_dir, obj_type, NULL);
-    priv->v0_dir_len = strlen(priv->v0_obj_dir);
-
     priv->obj_dir = g_build_filename (seaf_dir, "storage", obj_type, NULL);
     priv->dir_len = strlen (priv->obj_dir);
 
-    if (g_mkdir_with_parents (priv->v0_obj_dir, 0777) < 0) {
-        seaf_warning ("[Obj Backend] Objects dir %s does not exist and"
-                   " is unable to create\n", priv->v0_obj_dir);
-        goto onerror;
-    }
-
     if (g_mkdir_with_parents (priv->obj_dir, 0777) < 0) {
         seaf_warning ("[Obj Backend] Objects dir %s does not exist and"
                    " is unable to create\n", priv->obj_dir);
@@ -541,7 +524,6 @@ obj_backend_fs_new (const char *seaf_dir, const char *obj_type)
     return bend;
 
 onerror:
-    g_free (priv->v0_obj_dir);
     g_free (priv->obj_dir);
     g_free (priv);
     g_free (bend);