diff options
| author | manu <manu> | 2011-11-28 14:58:44 +0000 |
|---|---|---|
| committer | manu <manu> | 2011-11-28 14:58:44 +0000 |
| commit | 845a9c13d0af8e52524cb3218480c54deeab26b6 (patch) | |
| tree | 302be7e29e24e55e58db6850dcf61b453fbf2e18 /filesystems | |
| parent | c2b0e3139b26e383874e6c485807080780e2b7c9 (diff) | |
| download | pkgsrc-845a9c13d0af8e52524cb3218480c54deeab26b6.tar.gz | |
Remove two patches being idempotent together. I do not bump PKGREVISION,
as the result is the same.
Diffstat (limited to 'filesystems')
| -rw-r--r-- | filesystems/glusterfs/distinfo | 4 | ||||
| -rw-r--r-- | filesystems/glusterfs/patches/patch-bu | 23 | ||||
| -rw-r--r-- | filesystems/glusterfs/patches/patch-bz | 24 |
3 files changed, 1 insertions, 50 deletions
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo index ef99734bc7e..da311e2345b 100644 --- a/filesystems/glusterfs/distinfo +++ b/filesystems/glusterfs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2011/11/28 08:42:38 manu Exp $ +$NetBSD: distinfo,v 1.21 2011/11/28 14:58:44 manu Exp $ SHA1 (glusterfs-3.2.5.tar.gz) = 10f2e81ec7f118432c279236509fc3d89ab8f690 RMD160 (glusterfs-3.2.5.tar.gz) = 13d0f8c1a2a1e7d39a43899bc9d09f7f13fea844 @@ -28,8 +28,6 @@ SHA1 (patch-bq) = 083f22383b88890f9e6f2c90a4435657ccd10579 SHA1 (patch-br) = 5cd1d2692e34173f7e9f60b170373d499067d224 SHA1 (patch-bs) = d2f79ef19143f74f5a12187ea2dfd9e1ed92b726 SHA1 (patch-bt) = 58f8e5ce66e6b691dd9972bd649dc18f7d5a258a -SHA1 (patch-bu) = 006a6802958fad3950eadad456e362b7f4c2ca4a SHA1 (patch-bv) = 2c3b654e5858bf0948307ca6ae7048e276fca9ef SHA1 (patch-bw) = dca12eb81163fd1a0ada13165e990ddcb8fefbf2 SHA1 (patch-bx) = b2aca473091bb64d14c6da046379d33ca8a5785e -SHA1 (patch-bz) = 1b5756377e6eabfb93e07a8aab8007fca40e8a38 diff --git a/filesystems/glusterfs/patches/patch-bu b/filesystems/glusterfs/patches/patch-bu deleted file mode 100644 index d958aa731f7..00000000000 --- a/filesystems/glusterfs/patches/patch-bu +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-bu,v 1.3 2011/10/06 02:19:06 manu Exp $ - -Make gfid file changes non fatal, as it seems to work anyway. - ---- xlators/protocol/client/src/client3_1-fops.c.orig 2011-08-23 14:31:41.000000000 +0200 -+++ xlators/protocol/client/src/client3_1-fops.c 2011-09-17 15:45:30.000000000 +0200 -@@ -2208,13 +2208,11 @@ - } - - if ((!uuid_is_null (inode->gfid)) - && (uuid_compare (stbuf.ia_gfid, inode->gfid) != 0)) { -- gf_log (frame->this->name, GF_LOG_DEBUG, -- "gfid changed for %s", local->loc.path); -- rsp.op_ret = -1; -- op_errno = ESTALE; -- goto out; -+ gf_log (frame->this->name, GF_LOG_WARNING, -+ "gfid changed for %s", local->loc.path); -+ memcpy(&stbuf.ia_gfid, &inode->gfid, sizeof(inode->gfid)); - } - - rsp.op_ret = 0; - diff --git a/filesystems/glusterfs/patches/patch-bz b/filesystems/glusterfs/patches/patch-bz deleted file mode 100644 index 54c5022758c..00000000000 --- a/filesystems/glusterfs/patches/patch-bz +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bz,v 1.1 2011/11/28 08:42:39 manu Exp $ - -When a client detects a changed gfid, it means another machine replaced -the node. Return ESTALE that that the stall data get flushed. This avoid -having the changed node being inaccessible forever because lookups still -return the old deleted node. - -The fix is pulled from upstream. - ---- xlators/protocol/client/src/client3_1-fops.c.orig 2011-11-28 05:54:38.000000000 +0100 -+++ xlators/protocol/client/src/client3_1-fops.c 2011-11-28 05:59:46.000000000 +0100 -@@ -2210,9 +2210,11 @@ - if ((!uuid_is_null (inode->gfid)) - && (uuid_compare (stbuf.ia_gfid, inode->gfid) != 0)) { - gf_log (frame->this->name, GF_LOG_WARNING, - "gfid changed for %s", local->loc.path); -- memcpy(&stbuf.ia_gfid, &inode->gfid, sizeof(inode->gfid)); -+ rsp.op_ret = -1; -+ op_errno = ESTALE; -+ goto out; - } - - rsp.op_ret = 0; - |