Update to new upstream release which fixes missing goals bug and remove
upstreamed patches Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
This commit is contained in:
Jonathan Dieter
parent
9747ae759b
commit
55fb1c4385
|
|
@ -1 +1,2 @@
|
|||
/lizardfs-3.10.6.tar.gz
|
||||
/lizardfs-3.11.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
From bf9a99963cfbd46962579a5617bff8c20bc8339c Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Sarna <sarna@skytechnology.pl>
|
||||
Date: Wed, 16 Nov 2016 13:44:41 +0100
|
||||
Subject: [PATCH] chunkserver: Add alternative include path for fallocate
|
||||
|
||||
This commit adds another include path for FALLOC_FL_PUNCH_HOLE flag
|
||||
in order to make it work on CentOS 7, and, perhaps, other operating systems.
|
||||
|
||||
Closes #497
|
||||
|
||||
Change-Id: I55666e636cdb2e1f26fae7c8c2729833916d96af
|
||||
---
|
||||
EnvTests.cmake | 3 +++
|
||||
config.h.in | 1 +
|
||||
src/chunkserver/hddspacemgr.cc | 7 +++++++
|
||||
3 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/EnvTests.cmake b/EnvTests.cmake
|
||||
index d0cffb2..2eb86bb 100644
|
||||
--- a/EnvTests.cmake
|
||||
+++ b/EnvTests.cmake
|
||||
@@ -95,6 +95,9 @@ endif()
|
||||
|
||||
set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE")
|
||||
check_symbol_exists(FALLOC_FL_PUNCH_HOLE "fcntl.h" LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE)
|
||||
+if(NOT LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE)
|
||||
+ check_symbol_exists(FALLOC_FL_PUNCH_HOLE "linux/falloc.h" LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE_IN_LINUX_FALLOC_H)
|
||||
+endif()
|
||||
unset(CMAKE_REQUIRED_FLAGS)
|
||||
|
||||
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index 6d83be4..10e0d86 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -107,6 +107,7 @@
|
||||
#cmakedefine LIZARDFS_HAVE_PAM
|
||||
#cmakedefine LIZARDFS_HAVE_FALLOCATE
|
||||
#cmakedefine LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE
|
||||
+#cmakedefine LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE_IN_LINUX_FALLOC_H
|
||||
|
||||
/* [CMake] Other */
|
||||
#cmakedefine HAVE_CRCUTIL
|
||||
diff --git a/src/chunkserver/hddspacemgr.cc b/src/chunkserver/hddspacemgr.cc
|
||||
index 3b3b9ac..1a06727 100644
|
||||
--- a/src/chunkserver/hddspacemgr.cc
|
||||
+++ b/src/chunkserver/hddspacemgr.cc
|
||||
@@ -19,6 +19,10 @@
|
||||
#include "common/platform.h"
|
||||
#include "chunkserver/hddspacemgr.h"
|
||||
|
||||
+#ifdef LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE_IN_LINUX_FALLOC_H
|
||||
+# define LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE
|
||||
+#endif
|
||||
+
|
||||
#if defined(LIZARDFS_HAVE_FALLOCATE) && defined(LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE) && !defined(_GNU_SOURCE)
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
@@ -26,6 +30,9 @@
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#ifdef LIZARDFS_HAVE_FALLOC_FL_PUNCH_HOLE_IN_LINUX_FALLOC_H
|
||||
+# include <linux/falloc.h>
|
||||
+#endif
|
||||
#include <inttypes.h>
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From ada5b685cf961b62a33afd2c79ad59d78a2789be Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Dieter <jdieter@lesbg.com>
|
||||
Date: Mon, 24 Apr 2017 21:16:12 +0300
|
||||
Subject: [PATCH] common: Fix overflow error with GCC 7
|
||||
|
||||
This commit makes sure n is unsigned to avoid overflow errors in GCC 7.
|
||||
|
||||
Closes #540
|
||||
|
||||
Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
|
||||
|
||||
Change-Id: I09ae619029b756a11eeffee8fb55ffe2914c3e9a
|
||||
---
|
||||
src/common/galois_coeff.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/common/galois_coeff.h b/src/common/galois_coeff.h
|
||||
index 305bd10..07708ba 100644
|
||||
--- a/src/common/galois_coeff.h
|
||||
+++ b/src/common/galois_coeff.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- Copyright 2016 Skytechnology sp. z o.o.
|
||||
+ Copyright 2017 Skytechnology sp. z o.o.
|
||||
|
||||
This file is part of LizardFS.
|
||||
|
||||
@@ -37,7 +37,7 @@ constexpr uint8_t gf_mul2(uint8_t x) {
|
||||
* \param n Internal variable used for recursion.
|
||||
* \return log(x)
|
||||
*/
|
||||
-constexpr uint8_t gf_log(uint8_t x, uint8_t pow2n = 2, uint8_t n = 1) {
|
||||
+constexpr uint8_t gf_log(uint8_t x, uint8_t pow2n = 2, unsigned n = 1) {
|
||||
return x == pow2n ? n : gf_log(x, gf_mul2(pow2n), n + 1);
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ constexpr uint8_t gf_log(uint8_t x, uint8_t pow2n = 2, uint8_t n = 1) {
|
||||
* \param n Internal variable used for recursion.
|
||||
* \return exp(x)
|
||||
*/
|
||||
-constexpr uint8_t gf_exp(uint8_t x, uint8_t pow2n = 2, uint8_t n = 1) {
|
||||
+constexpr uint8_t gf_exp(uint8_t x, uint8_t pow2n = 2, unsigned n = 1) {
|
||||
return x == n ? pow2n : gf_exp(x, gf_mul2(pow2n), n + 1);
|
||||
}
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Name: lizardfs
|
||||
Summary: Distributed, fault tolerant file system
|
||||
Version: 3.10.6
|
||||
Release: 7%{?dist}
|
||||
Version: 3.11.0
|
||||
Release: 1%{?dist}
|
||||
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
|
||||
# src/common/coroutine.h, under the Boost license
|
||||
License: GPLv3 and ASL 2.0 and Boost
|
||||
|
|
@ -10,15 +10,9 @@ URL: http://www.lizardfs.org/
|
|||
Source: https://github.com/lizardfs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: pam-lizardfs
|
||||
Source2: 95-lizardfs.conf
|
||||
# Allows us to create sparse files in el7
|
||||
# Upstream patch at https://github.com/lizardfs/lizardfs/commit/bf9a99963cfbd46962579a5617bff8c20bc8339c
|
||||
Patch1: 0001-chunkserver-Add-alternative-include-path-for-falloca.patch
|
||||
# Make sure we drop supplementary groups when running setgid
|
||||
# Pull request at https://github.com/lizardfs/lizardfs/pull/533
|
||||
Patch2: 0001-main-Remove-supplementary-groups-when-dropping-privi.patch
|
||||
# Fix overflow error in GCC 7
|
||||
# Upstream patch at https://github.com/lizardfs/lizardfs/commit/d65ce8aa4c10e914840d78246249b2451bd46ad2
|
||||
Patch3: 0001-common-Fix-overflow-error-with-GCC-7.patch
|
||||
Patch1: 0001-main-Remove-supplementary-groups-when-dropping-privi.patch
|
||||
BuildRequires: fuse-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: pkgconfig
|
||||
|
|
@ -363,6 +357,7 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
|
|||
%{_mandir}/man1/lizardfs-repquota.1*
|
||||
%{_mandir}/man1/lizardfs-rgetgoal.1*
|
||||
%{_mandir}/man1/lizardfs-rgettrashtime.1*
|
||||
%{_mandir}/man1/lizardfs-rremove.1*
|
||||
%{_mandir}/man1/lizardfs-rsetgoal.1*
|
||||
%{_mandir}/man1/lizardfs-rsettrashtime.1*
|
||||
%{_mandir}/man1/lizardfs-seteattr.1*
|
||||
|
|
@ -371,6 +366,7 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
|
|||
%{_mandir}/man1/lizardfs-settrashtime.1*
|
||||
%{_mandir}/man1/lizardfs.1*
|
||||
%{_mandir}/man5/iolimits.cfg.5*
|
||||
%{_mandir}/man5/mfsmount.cfg.5*
|
||||
%{_mandir}/man7/mfs.7*
|
||||
%{_mandir}/man7/moosefs.7*
|
||||
%{_mandir}/man7/lizardfs.7*
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (lizardfs-3.10.6.tar.gz) = 2d5a1e06c3fb43febeb7f7d75b38fef31d5c719f4f52d093dc427bf295a977022d1c25e1d19871ae47b49c154a6572ff47f2d71b0186c9d57891ae5b5a63fde7
|
||||
SHA512 (lizardfs-3.11.0.tar.gz) = 39fb758354371cf9da82602c69f4368e44511ccda49e0f81527036ed5013b05d2048ac1b66d11ca22fb7f3d48ebdc49f1fc53881e94c45db7af784555bd438be
|
||||
|
|
|
|||
Loading…
Reference in New Issue