4 files changed, 84 insertions, 4 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 302fb7b97fbf..d92ebf76aaa3 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.56 2014/06/25 09:54:31 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.57 2014/06/25 15:48:20 dev-zero Exp $
+
+*glusterfs-3.4.4-r2 (25 Jun 2014)
+
+  25 Jun 2014; Tiziano Müller <dev-zero@gentoo.org> +files/glusterfs-3.4.4-clust
+  er-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch,
+  +glusterfs-3.4.4-r2.ebuild, -glusterfs-3.4.4-r1.ebuild:
+  Revision bump to pull in yet another important fix for 3.4.4 (client crash
+  after rebalance, upstream bug #961615).
 
 *glusterfs-3.4.4-r1 (25 Jun 2014)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 9cf8b7c9ce13..be8d79f394ef 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
 AUX glusterd-r1.initd 451 SHA256 de39e1118fa1bfcc517f711e819ec78e67c58270383372a17886ca7362a7064b SHA512 90ba1109d393df99d7cc3092862684fd9d9a84b8ff8d7c7b5c7bfdabacee6ee209aa13e7c8d6b9497967aa5b5c30e984adf231b394dfbebb5d4d1f15b9f70f28 WHIRLPOOL 630596cba4af48fcdfb94bedf7f6a609dce85ac8dda835b699fd2ad0c3af64bd0b014c6fb97fe9d6faff8fc9a9652a2636e85372384027ac013abedeb71287c1
@@ -11,6 +14,7 @@ AUX glusterfs-3.3.0-silent_rules.patch 611 SHA256 6795dce0036131827fb10da67912bc
 AUX glusterfs-3.4.0-build-shared-only.patch 22147 SHA256 d11a171ffbc7b8a1fbcac5c651b2ad889a80b80bb2104787d6fd4bf56a2c2379 SHA512 a7b9a21717dff9f884674ea8b2b35e55f15c80a3ef4489a3ee2599c3f6d00534acedd6cbe09005d01d80a1fd0fc2e123745daa5bc7ca4d2166faed4a2b9822fa WHIRLPOOL 2a080cdbacac269b88109df6f3cb45a33bcddd0dfaf65a09160e8e17a9ef78e760f80b6acb3f9166ae7d4494820ec6562b3be8527510f93638556e21e7ce27c1
 AUX glusterfs-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch 1570 SHA256 feb911c892a594ecf75528fa5db90882225e1461d922a82ef0cc6b59d861e38a SHA512 ce50b1eeee82d2c1b46198be5729576a4b3d808618529dd72db31259a03993c1e2636cb52575c3f7c0276170f5292b1a62edb2d6960c28246ea52b9362a6de93 WHIRLPOOL 2a1c853c66fa6e2e799780347bcd863e4981dd835ab10cfd74e7673484860f37bff22bf51a878313293f1e6cb6d074888b665211e8e00c6242a7a0d051e54347
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
+AUX glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch 1811 SHA256 3d3faf6abf5ee73a0be90e9202b27a3d2ff96be4e50c48c4bf281f4b15918263 SHA512 abb4efd78a2091dc7a810a92b3d06c01f8674798aee24664bd65eab05369b95b16afb09d0b001575d90e19ccd2d89f29796af251c18e1f164cd8eedc91db4a9e WHIRLPOOL acb1c5ebb33b8ff390a1b407b44ee37e64112f4c901a03f59c7848bcae748c9334453316326c244b96bdee462d4a1184b7f609e968bef1e03e17e5dc74111cd5
 AUX glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch 3120 SHA256 1f275bcd574a9f4b7d0d7f63976f4600b27ebd0f5825aa021d5369909cedae37 SHA512 c4608299a3d1df7e894a06b4c9de7b2c8fad222b8521293e05339e6ed222d5896f26d1f23e5f24c85205b86fb789c914719dd09370f3c58a28b5b0a4b2d6068f WHIRLPOOL c7d94cf52025851647aaa07338aacb1b7f495195da2b3521fd429adc069836a44d5666b87e69bd7204f09b2d2ab0418709e033eb3a5bc91f38fe415df14e6afe
 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
 AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2
@@ -29,7 +33,26 @@ EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c
 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
 EBUILD glusterfs-3.4.2-r1.ebuild 4638 SHA256 b2bcb8fccaeec4497e530b7f35b5fd0d8a4c11a03db79ff8150d1ea42073d5b1 SHA512 adbbc2696670439d031273a0d5fde1882585a0361d73e78826d1adb4cf44dd9256361fe5e9f626655a0365c4d2c49d9725b869cfa7170507c17eab60049cb632 WHIRLPOOL a1bdf5ac317dde52303ba5d806bf9c5ed1207102f478f9ce2c87f28b1c802e680e0068dd2e059573cdb619746e9968257fd6dcf7400bf759253d5aaf974bdeec
-EBUILD glusterfs-3.4.4-r1.ebuild 4667 SHA256 b0f8fe093a6e859e57df157949f19c0cd318df8be9f2d98f668b96882d0e6b1c SHA512 1f0b014e4f806afb73e6f574207198e2f2aa018af5ef1c3b9baff75e13d0c66f9e64332b1caa52274adb9b8e4f21ede2cdaddac6e6c57a5fa72dcbb64d923d6f WHIRLPOOL 1fb1c0d5daecd97c4f2ec04577fe9feaa93184f09bc29cf756854f328b55e7cac9d4ba30d07a21fd56684930851b059c66950a2ab0e5b2f1dd78ddf2b71bdb1a
+EBUILD glusterfs-3.4.4-r2.ebuild 4753 SHA256 84c89911307c5deb3a73d687662e54fbd8465c23b621fc47eae4cc7c99b03773 SHA512 d86ada3611a3b89fc50f5d53d0165637b7725b865b503dbaeac77ae2f312a4f24028d80a9b3fe97dc6848cbe99e41f33d5f91fde20d12e35a36a582a3d1d6aa4 WHIRLPOOL d4197af0909df0645b65d9934d752139a32d38019c0b040b79a5f86bff57d8ddea9fe7952039e6deda1419e5715c55cf328c41425c60a017692bd2fa404515af
 EBUILD glusterfs-3.4.4.ebuild 4593 SHA256 d396bad164bad9e0a7379cec9134107aaf6ff7ee92350c9877b243c78b0a748b SHA512 a6c9dbc24bd98f9cdcd7db6cd1dc55793a9ed6c0400f459a6726b697298c28860d30461498ebcd1c0ca47601f1ce02d82a8ae7d00398b9dcf090d8618fb7cbe4 WHIRLPOOL 4c47c87d7094e99e9d5977b47a200defc3a592c9a734d2b39e240106fdbda7a68c6db0bb183505411a51559c91a7757d3689f0fcd2610602919b8b60a1706a29
-MISC ChangeLog 11379 SHA256 afda85279290a4396bd28be53a59536cfdc7eee9b58ecd30a764de535d3eae1e SHA512 d762fb186d1f38566b983cb5f322c87d30ef32ab749e9a0dc9d9a6c26275a484099fe19b0d512756984fbdfa006e71063ef8588df3abca08a598c86c05418e68 WHIRLPOOL 660acb1ea8dbf58861e94ecff1ae694d297b7b7b23fee2f7490f963b654f4f4692173cedd2f63dc6e94fd93aeb17e5db93aa0b7a4b9e27807617e10a0c2b4741
+MISC ChangeLog 11731 SHA256 bc30ebb5eb43915a78724bfc092ebd28590be5fa7b9667061bd9712cc0a292f8 SHA512 6bf7f6479ed06b4bd8fc3ed0add600ed1d3d3bdf0fd38406c38bbdf41dcef3ef507eb2df30f4217afe8b7f36d6c256ff19fe08511e519be2e3fada2dfe5cba90 WHIRLPOOL 04ac29db250cddf5b7c6a68f5df5bd0e10632f53536ac23a274b8eb941037e663f2bb5221245bc9459afaf66caf8e57353d2aee3f168741e633f0222490a180b
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTqu9FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9Sm4P/3iuXfA7C8IVtj7Q/NIW85+Q
+g1tNfaf6Jm+32afKXqoyF1WaW7CMvn6FQBLy0UFAb1RvsqU0AweEgGhw5+nylf/V
++hQp86io16QxO3g7AASrW0MDmvm0SnYfPO05J5whp3Qjr3/XrSntQepWzSt3m4Cp
+flUs/t0A3U3TQEqAsZgAKua+8knQFKpyXsDvTOiIf8Ls8vV8gL1ulwtcKXUyDUtq
+HVned+m3JIlqLsyX96Vefiy9rcURcIwRHBt1rf+91pUbTS2wOA5Ec05Vq8KGj+pS
+0tcYn7SJou9+6LO28mQNK/6of69MWscHaHrSvGPLeFZwJeMAqFJ/Hzdd3d3EZwkn
+Ge7Uhas81f2wgAoLxNEMH+djP9e9i9/eoV8TyYhDEIVvudwmQlZSF3LGcFJhTrNC
+6OGDDFNaUx/e6aLSgsHoMQVcl5alVgTGlzJY0IIPdmA4uWTQ3UfCIByvrczMX2/7
+3joyRuag3LdEmt4fcgEg/cvuCsCbEf1bNAdX5wMMLE3TK/mpRZEhKdyTtur6ye1v
+AlR9vP5cXOKHT/keIK1RiB85xiHsxjwv6WDsxE1Hru0P9ByKShJtGpK2xPIImUIE
+0jjLeKKGgzQGTNLV6r11rZoCsEG8M81d44uspK+QIMw8X/igsZosU5B3+JXB8k8V
+3uGYLB2tk80ielxuGFUw
+=I7BQ
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch
new file mode 100644
index 000000000000..c26085a9dfe7
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch
@@ -0,0 +1,48 @@
+From 2b789331dc933b186360fc8cbffb06289ee60ee9 Mon Sep 17 00:00:00 2001
+From: Vijay Bellur <vbellur@redhat.com>
+Date: Tue, 10 Jun 2014 22:21:28 +0530
+Subject: [PATCH 1/3] cluster/dht: Don't do extra unref in dht-migration checks
+
+Problem:
+syncop_open used to perform a ref in syncop_open_cbk so the extra
+unref was needed but now syncop_open_cbk does not take a ref so no
+need to do extra unref.
+
+Fix:
+remove the extra fd_unref and let dht_local_wipe do the final unref.
+
+Change-Id: Ibe8f9a678d456a0c7bff175306068b5cd297ecc4
+BUG: 961615
+Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
+Signed-off-by: Vijay Bellur <vbellur@redhat.com>
+Reviewed-on: http://review.gluster.org/8029
+Tested-by: Gluster Build System <jenkins@build.gluster.com>
+Tested-by: Joe Julian <joe@julianfamily.org>
+Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+---
+ xlators/cluster/dht/src/dht-helper.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
+index ef29e3f..dd8dc49 100644
+--- a/xlators/cluster/dht/src/dht-helper.c
++++ b/xlators/cluster/dht/src/dht-helper.c
+@@ -802,13 +802,10 @@ dht_migration_complete_check_task (void *data)
+         if (!local->fd)
+                 goto out;
+         /* once we detect the migration complete, the fd-ctx is no more
+-           required.. delete the ctx, and do one extra 'fd_unref' for open fd */
++           required.. delete the ctx */
+         ret = fd_ctx_del (local->fd, this, NULL);
+-        if (!ret) {
+-                fd_unref (local->fd);
+-                ret = 0;
++        if (!ret)
+                 goto out;
+-        }
+ 
+         /* perform open as root:root. There is window between linkfile
+          * creation(root:root) and setattr with the correct uid/gid
+-- 
+1.9.2
+
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild
index edea95e962e1..4c25f5743797 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild,v 1.1 2014/06/25 09:54:31 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild,v 1.1 2014/06/25 15:48:20 dev-zero Exp $
 
 EAPI=5
 
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
 	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
 	"${FILESDIR}/${PN}-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch"
+	"${FILESDIR}/${PN}-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )