summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanju Rakonde <srakonde@redhat.com>2019-03-08 11:12:29 +0530
committerAtin Mukherjee <amukherj@redhat.com>2019-03-11 06:12:36 +0000
commit32824af10a8daa7239157af3326769c4a6b8f72f (patch)
tree01e196b9d5b9ba578ff8806561a3ca48c9eecbb7
parentca9bef7f1538beb570fcb190ff94f86f0b8ba38a (diff)
glusterd: change the op-version
as commit 073444 is backported to release-5.4 branch, op-version for this change should 5.4 instead of 6. fixes: bz#1685120 Change-Id: Id504b9a1446125cea7c6a32117ccc44f28e73aa7 Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
-rw-r--r--libglusterfs/src/common-utils.c2
-rw-r--r--libglusterfs/src/glusterfs/globals.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index e923771..e312b10 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2015,7 +2015,7 @@ get_checksum_for_file(int fd, uint32_t *checksum, int op_version)
do {
ret = sys_read(fd, &buf, GF_CHECKSUM_BUF_SIZE);
if (ret > 0) {
- if (op_version < GD_OP_VERSION_6_0)
+ if (op_version < GD_OP_VERSION_5_4)
compute_checksum(buf, GF_CHECKSUM_BUF_SIZE, checksum);
else
compute_checksum(buf, ret, checksum);
diff --git a/libglusterfs/src/glusterfs/globals.h b/libglusterfs/src/glusterfs/globals.h
index 980beb1..114adc3 100644
--- a/libglusterfs/src/glusterfs/globals.h
+++ b/libglusterfs/src/glusterfs/globals.h
@@ -111,6 +111,8 @@
#define GD_OP_VERSION_5_0 50000 /* Op-version for GlusterFS 5.0 */
+#define GD_OP_VERSION_5_4 50400 /* Op-version for GlusterFS 5.4 */
+
#define GD_OP_VERSION_6_0 60000 /* Op-version for GlusterFS 6.0 */
#define GD_OP_VERSION_7_0 70000 /* Op-version for GlusterFS 7.0 */