Merge branch 'upstream'

Conflicts:
	glusterfs.spec.in
	xlators/mgmt/glusterd/src/Makefile.am
	xlators/mgmt/glusterd/src/glusterd-utils.c
	xlators/mgmt/glusterd/src/glusterd.h

Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d

6 files changed, 58 insertions, 18 deletions

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 2bab0f853..164a651ba 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -861,6 +861,8 @@ afr_local_transaction_cleanup (afr_local_t *local, xlator_t *this)
 
         GF_FREE (local->transaction.pre_op);
         GF_FREE (local->transaction.eager_lock);
+        GF_FREE (local->transaction.fop_subvols);
+        GF_FREE (local->transaction.failed_subvols);
 
         GF_FREE (local->transaction.basename);
         GF_FREE (local->transaction.new_basename);
@@ -889,6 +891,15 @@ afr_replies_wipe (afr_local_t *local, afr_private_t *priv)
 	memset (local->replies, 0, sizeof(*local->replies) * priv->child_count);
 }
 
+void
+afr_remove_eager_lock_stub (afr_local_t *local)
+{
+        LOCK (&local->fd->lock);
+        {
+                list_del_init (&local->transaction.eager_locked);
+        }
+        UNLOCK (&local->fd->lock);
+}
 
 void
 afr_local_cleanup (afr_local_t *local, xlator_t *this)
@@ -900,6 +911,10 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)
 
 	syncbarrier_destroy (&local->barrier);
 
+        if (local->transaction.eager_lock_on &&
+            !list_empty (&local->transaction.eager_locked))
+                afr_remove_eager_lock_stub (local);
+
         afr_local_transaction_cleanup (local, this);
 
         priv = this->private;
@@ -969,6 +984,8 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)
 
         { /* writev */
                 GF_FREE (local->cont.writev.vector);
+                if (local->cont.writev.iobref)
+                        iobref_unref (local->cont.writev.iobref);
         }
 
         { /* setxattr */
@@ -2106,6 +2123,12 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd)
         fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
         if (fd_ctx) {
+                //no need to take any locks
+                if (!list_empty (&fd_ctx->eager_locked))
+                        gf_log (this->name, GF_LOG_WARNING, "%s: Stale "
+                                "Eager-lock stubs found",
+                                uuid_utoa (fd->inode->gfid));
+
 		for (i = 0; i < AFR_NUM_CHANGE_LOGS; i++)
 			GF_FREE (fd_ctx->pre_op_done[i]);
 
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index 01e078c13..4cb219246 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -1487,7 +1487,7 @@ afr_fgetxattr_wind (call_frame_t *frame, xlator_t *this, int subvol)
 		return 0;
 	}
 
-	STACK_WIND_COOKIE (frame, (void *) (long) subvol, afr_fgetxattr_cbk,
+	STACK_WIND_COOKIE (frame, afr_fgetxattr_cbk, (void *) (long) subvol,
 			   priv->children[subvol],
 			   priv->children[subvol]->fops->fgetxattr,
 			   local->fd, local->cont.getxattr.name,
diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c
index 3dacfc8dd..3013ae730 100644
--- a/xlators/cluster/afr/src/afr-inode-write.c
+++ b/xlators/cluster/afr/src/afr-inode-write.c
@@ -1588,7 +1588,7 @@ afr_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
 	if (!transaction_frame)
 		goto out;
 
-	local = AFR_FRAME_INIT (frame, op_errno);
+	local = AFR_FRAME_INIT (transaction_frame, op_errno);
 	if (!local)
 		goto out;
 
@@ -1702,7 +1702,7 @@ afr_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
 	if (!transaction_frame)
 		goto out;
 
-	local = AFR_FRAME_INIT (frame, op_errno);
+	local = AFR_FRAME_INIT (transaction_frame, op_errno);
 	if (!local)
 		goto out;
 
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index c0385153f..c0548d995 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -159,7 +159,7 @@ __afr_selfheal_data_read_write (call_frame_t *frame, xlator_t *this, fd_t *fd,
 		 */
 #define is_last_block(o,b,s) ((s >= o) && (s <= (o + b)))
 		if (HAS_HOLES ((&replies[source].poststat)) &&
-		    offset > replies[i].poststat.ia_size &&
+		    offset >= replies[i].poststat.ia_size &&
 		    !is_last_block (offset, size,
 				    replies[source].poststat.ia_size) &&
 		    (iov_0filled (iovec, count) == 0))
@@ -268,6 +268,31 @@ afr_selfheal_data_restore_time (call_frame_t *frame, xlator_t *this,
 }
 
 static int
+afr_data_self_heal_type_get (afr_private_t *priv, unsigned char *healed_sinks,
+                             int source, struct afr_reply *replies)
+{
+        int type = AFR_SELFHEAL_DATA_FULL;
+        int i = 0;
+
+        if (priv->data_self_heal_algorithm == NULL) {
+                type = AFR_SELFHEAL_DATA_FULL;
+                for (i = 0; i < priv->child_count; i++) {
+                        if (!healed_sinks[i] && i != source)
+                                continue;
+                        if (replies[i].poststat.ia_size) {
+                                type = AFR_SELFHEAL_DATA_DIFF;
+                                break;
+                        }
+                }
+        } else if (strcmp (priv->data_self_heal_algorithm, "full") == 0) {
+                type = AFR_SELFHEAL_DATA_FULL;
+        } else if (strcmp (priv->data_self_heal_algorithm, "diff") == 0) {
+                type = AFR_SELFHEAL_DATA_DIFF;
+        }
+        return type;
+}
+
+static int
 afr_selfheal_data_do (call_frame_t *frame, xlator_t *this, fd_t *fd,
 		      int source, unsigned char *healed_sinks,
 		      struct afr_reply *replies)
@@ -296,14 +321,8 @@ afr_selfheal_data_do (call_frame_t *frame, xlator_t *this, fd_t *fd,
 		"source=%d sinks=%s",
 		uuid_utoa (fd->inode->gfid), source, sinks_str);
 
-	for (i = 0; i < priv->child_count; i++) {
-		if (!healed_sinks[i] && i != source)
-			continue;
-		if (replies[i].poststat.ia_size) {
-			type = AFR_SELFHEAL_DATA_DIFF;
-			break;
-		}
-	}
+        type = afr_data_self_heal_type_get (priv, healed_sinks, source,
+                                            replies);
 
 	iter_frame = afr_copy_frame (frame);
 	if (!iter_frame)
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index f974fdb59..205ff759e 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -1544,7 +1544,7 @@ afr_delayed_changelog_wake_up (xlator_t *this, fd_t *fd)
 }
 
 
-        int
+int
 afr_transaction_resume (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t         *local    = NULL;
@@ -1555,11 +1555,7 @@ afr_transaction_resume (call_frame_t *frame, xlator_t *this)
                 /* We don't need to retain "local" in the
                    fd list anymore, writes to all subvols
                    are finished by now */
-                LOCK (&local->fd->lock);
-                {
-                        list_del_init (&local->transaction.eager_locked);
-                }
-                UNLOCK (&local->fd->lock);
+                afr_remove_eager_lock_stub (local);
         }
 
         afr_restore_lk_owner (frame);
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h
index 2e1b78d1c..36042f7b2 100644
--- a/xlators/cluster/afr/src/afr.h
+++ b/xlators/cluster/afr/src/afr.h
@@ -971,4 +971,6 @@ afr_handle_open_fd_count (call_frame_t *frame, xlator_t *this);
 int
 afr_local_pathinfo (char *pathinfo, gf_boolean_t *is_local);
 
+void
+afr_remove_eager_lock_stub (afr_local_t *local);
 #endif /* __AFR_H__ */