From b23be2e7581c6aa295053dc8866cab841ae374b6 Mon Sep 17 00:00:00 2001
From: Venkatesh Somyajulu <vsomyaju@redhat.com>
Date: Fri, 22 Aug 2014 17:07:15 +0530
Subject: storage/posix: Don't unlink .glusterfs-hardlink before linkto check

BUG: 1116150
Change-Id: I90a10ac54123fbd8c7383ddcbd04e8879ae51232
Signed-off-by: Venkatesh Somyajulu <vsomyaju@redhat.com>
Reviewed-on: http://review.gluster.org/8559
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: N Balachandran <nbalacha@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 xlators/storage/posix/src/posix.c | 45 ++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

(limited to 'xlators/storage')

diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 330fb74a550..21947486490 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -1354,6 +1354,41 @@ out:
         return 0;
 }
 
+int32_t
+posix_unlink_gfid_handle_and_entry (xlator_t *this, const char *real_path,
+                                    struct iatt *stbuf, int32_t *op_errno)
+{
+        int32_t             ret      =   0;
+
+        /*  Unlink the gfid_handle_first */
+
+        if (stbuf && stbuf->ia_nlink == 1) {
+                ret = posix_handle_unset (this, stbuf->ia_gfid, NULL);
+                if (ret) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "unlink of gfid handle failed for path:%s with"
+                                "gfid %s with errno:%s", real_path,
+                                uuid_utoa (stbuf->ia_gfid), strerror (errno));
+                }
+        }
+
+        /* Unlink the actual file */
+        ret = sys_unlink (real_path);
+        if (ret == -1) {
+                if (op_errno)
+                        *op_errno = errno;
+
+                gf_log (this->name, GF_LOG_ERROR,
+                        "unlink of %s failed: %s", real_path,
+                        strerror (errno));
+                goto err;
+        }
+
+        return 0;
+
+err:
+        return -1;
+}
 
 int32_t
 posix_unlink (call_frame_t *frame, xlator_t *this,
@@ -1394,9 +1429,6 @@ posix_unlink (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
-        if (stbuf.ia_nlink == 1)
-                posix_handle_unset (this, stbuf.ia_gfid, NULL);
-
         priv = this->private;
 
         op_ret = dict_get_int32 (xdata, DHT_SKIP_OPEN_FD_UNLINK,
@@ -1481,12 +1513,9 @@ posix_unlink (call_frame_t *frame, xlator_t *this,
                 }
         }
 
-        op_ret = sys_unlink (real_path);
+        op_ret =  posix_unlink_gfid_handle_and_entry (this, real_path, &stbuf,
+                                                      &op_errno);
         if (op_ret == -1) {
-                op_errno = errno;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "unlink of %s failed: %s", real_path,
-                        strerror (op_errno));
                 goto out;
         }
 
-- 
cgit