Pinkbyte/pinkbyte-overlay
1
Fork 0
Code Releases Activity

Bump new ebuilds of zfs and spl, make it fully compatible with Linux 3.2

Browse Source 
Used commits: zfsonlinux/spl@588d900, zfsonlinux/zfs@166dd49 and zfsonlinux/zfs@28eb921
Closes #3
This commit is contained in:
Sergey Popov 2012-02-26 14:37:02 +04:00
parent 7e766d137d
commit 1876178779
7 changed files with 1544 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys-devel/spl/Manifest
View File

@ -1,7 +1,7 @@
AUX spl-0.6.0-includedir.patch 1179 RMD160 cade3b696d6981b2583cc5ae8ecf614d38ef2efc SHA1 2c5ce007df75a7a8425e1a28308eefdcb29446c2 SHA256 8d05fc006348264e1633e14b73e022d482164d6cefc8d2425faffc50d2346150
AUX spl-0.6.0-kernel-3.1-compat.patch 27063 RMD160 df1d3e67b7aba240b7e02150122715396888e83d SHA1 d2f9266741758c8b94212885dc74b115fb6c5bcb SHA256 7cb0f13b973f03907a35f81fd4b2e7f3316029ed2aa6a79522bc2a4bf5501d72
AUX spl-0.6.0-kernel-3.2-compat.patch 9656 RMD160 e0d03d25fa80cec7ee620fa5522ce505bfa1a050 SHA1 730c79be658e48f7fdecd1c4a62fcfafafe59f53 SHA256 cb6a02de0e113f8784382811dd589da9ca9dd5af430f746b6503ebc58046189b
AUX spl-9999-includedir.patch 1165 RMD160 98219674ccbea205a3ec1de20ecfd0ca331a2537 SHA1 4d5f92617640dcdb763586f86633c894ef260fb5 SHA256 d5e7a3edabdce01cdda2dc105bafd62935f54f9cd708dcfb5b9927c6e179ecb8
DIST spl-0.6.0-rc6.tar.gz 438215 RMD160 8acfc2f7817993f561e78e6627eab22555d8ed27 SHA1 7cdbf313ccae73b382022da408eb17d6a612dd5b SHA256 a728ec0e5db9260d48e8165d3ac6f783b17812fca7b87966fae085c9e7a48446
EBUILD spl-0.6.0_rc6-r1.ebuild 1113 RMD160 a18bcdc22b92b651544e81c2ee973ac03494ad4b SHA1 e01e006853fbb356ffb55ee9b26c06b972a45eb9 SHA256 d9fda2a368fa33be6d5821e9387db35f3369f5260fae3a63f3a59b47216c5966
EBUILD spl-0.6.0_rc6.ebuild 1007 RMD160 cdbf9d35749584ec03f629cb056f7d667ceb2268 SHA1 e2ac30a80e61ec2c31afaefa87707163abf25b53 SHA256 25e2e25924c18ec112842b917202da8dd97989ca3175e79b824811066ea3d6f3
EBUILD spl-0.6.0_rc6-r2.ebuild 1218 RMD160 1f4701ed12c560e1b2ded9328c12abef8003c49b SHA1 b8f5d36eaeb5665391af64f6f2d3a1dedbdc358d SHA256 c65c421f368e72cf3aab837bbf87d6bb3b0153a5fdef0ae34dea077f053aadbd
EBUILD spl-9999.ebuild 930 RMD160 f80465a36115277d860f6c931c44052578a8c97a SHA1 3962be9e632fe195cf8d069a55bf56abaf53e46a SHA256 eefd5ddf6c45d36ac39ed7e29e872064e823e87f2d895a09f6c8aaf87f1f55f2

325
sys-devel/spl/files/spl-0.6.0-kernel-3.2-compat.patch Normal file
View File

@ -0,0 +1,325 @@
diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 90ff680..27b2c42 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -85,6 +85,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
SPL_AC_KERN_PATH_PARENT_SYMBOL
SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE
SPL_AC_SHRINK_CONTROL_STRUCT
+ SPL_AC_RWSEM_SPINLOCK_IS_RAW
])
AC_DEFUN([SPL_AC_MODULE_SYMVERS], [
@@ -1973,3 +1974,29 @@ AC_DEFUN([SPL_AC_SHRINK_CONTROL_STRUCT], [
AC_MSG_RESULT(no)
])
])
+
+dnl #
+dnl # 3.1 API Change
+dnl #
+dnl # The rw_semaphore.wait_lock member was changed from spinlock_t to
+dnl # raw_spinlock_t at commit ddb6c9b58a19edcfac93ac670b066c836ff729f1.
+dnl #
+AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [
+ AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw])
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-Werror"
+ SPL_LINUX_TRY_COMPILE([
+ #include <linux/rwsem.h>
+ ],[
+ struct rw_semaphore dummy_semaphore __attribute__ ((unused));
+ raw_spinlock_t dummy_lock __attribute__ ((unused));
+ dummy_semaphore.wait_lock = dummy_lock;
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(RWSEM_SPINLOCK_IS_RAW, 1,
+ [struct rw_semaphore member wait_lock is raw_spinlock_t])
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ EXTRA_KCFLAGS="$tmp_flags"
+])
diff --git a/configure b/configure
index 9d95d76..621773d 100755
--- a/configure
+++ b/configure
@@ -16025,6 +16025,76 @@ fi
+
+ { $as_echo "$as_me:$LINENO: checking whether struct rw_semaphore member wait_lock is raw" >&5
+$as_echo_n "checking whether struct rw_semaphore member wait_lock is raw... " >&6; }
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-Werror"
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+ #include <linux/rwsem.h>
+
+int
+main (void)
+{
+
+ struct rw_semaphore dummy_semaphore __attribute__ ((unused));
+ raw_spinlock_t dummy_lock __attribute__ ((unused));
+ dummy_semaphore.wait_lock = dummy_lock;
+
+ ;
+ return 0;
+}
+
+_ACEOF
+
+
+ rm -Rf build && mkdir -p build
+ echo "obj-m := conftest.o" >build/Makefile
+ if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define RWSEM_SPINLOCK_IS_RAW 1
+_ACEOF
+
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+ rm -Rf build
+
+
+ EXTRA_KCFLAGS="$tmp_flags"
+
;;
user) ;;
all)
@@ -20335,6 +20405,76 @@ fi
+ { $as_echo "$as_me:$LINENO: checking whether struct rw_semaphore member wait_lock is raw" >&5
+$as_echo_n "checking whether struct rw_semaphore member wait_lock is raw... " >&6; }
+ tmp_flags="$EXTRA_KCFLAGS"
+ EXTRA_KCFLAGS="-Werror"
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+ #include <linux/rwsem.h>
+
+int
+main (void)
+{
+
+ struct rw_semaphore dummy_semaphore __attribute__ ((unused));
+ raw_spinlock_t dummy_lock __attribute__ ((unused));
+ dummy_semaphore.wait_lock = dummy_lock;
+
+ ;
+ return 0;
+}
+
+_ACEOF
+
+
+ rm -Rf build && mkdir -p build
+ echo "obj-m := conftest.o" >build/Makefile
+ if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define RWSEM_SPINLOCK_IS_RAW 1
+_ACEOF
+
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+ rm -Rf build
+
+
+ EXTRA_KCFLAGS="$tmp_flags"
+
+
;;
srpm) ;;
*)
diff --git a/include/linux/rwsem_compat.h b/include/linux/rwsem_compat.h
index 67a82bb..fe69f01 100644
--- a/include/linux/rwsem_compat.h
+++ b/include/linux/rwsem_compat.h
@@ -27,6 +27,26 @@
#include <linux/rwsem.h>
+#ifdef RWSEM_SPINLOCK_IS_RAW
+#define spl_rwsem_lock_irqsave(lock, flags) \
+({ \
+ raw_spin_lock_irqsave(lock, flags); \
+})
+#define spl_rwsem_unlock_irqrestore(lock, flags) \
+({ \
+ raw_spin_unlock_irqrestore(lock, flags); \
+})
+#else
+#define spl_rwsem_lock_irqsave(lock, flags) \
+({ \
+ spin_lock_irqsave(lock, flags); \
+})
+#define spl_rwsem_unlock_irqrestore(lock, flags) \
+({ \
+ spin_unlock_irqrestore(lock, flags); \
+})
+#endif /* RWSEM_SPINLOCK_IS_RAW */
+
#ifdef RWSEM_IS_LOCKED_TAKES_WAIT_LOCK
/*
* A race condition in rwsem_is_locked() was fixed in Linux 2.6.33 and the fix
@@ -48,14 +68,14 @@
#else
-#define spl_rwsem_is_locked(rwsem) \
-({ \
- unsigned long _flags_; \
- int _rc_; \
- spin_lock_irqsave(&rwsem->wait_lock, _flags_); \
- _rc_ = rwsem_is_locked(rwsem); \
- spin_unlock_irqrestore(&rwsem->wait_lock, _flags_); \
- _rc_; \
+#define spl_rwsem_is_locked(rwsem) \
+({ \
+ unsigned long _flags_; \
+ int _rc_; \
+ spl_rwsem_lock_irqsave(&rwsem->wait_lock, _flags_); \
+ _rc_ = rwsem_is_locked(rwsem); \
+ spl_rwsem_unlock_irqrestore(&rwsem->wait_lock, _flags_); \
+ _rc_; \
})
#endif /* RWSEM_IS_LOCKED_TAKES_WAIT_LOCK */
diff --git a/include/sys/rwlock.h b/include/sys/rwlock.h
index 3d98085..9d29ad6 100644
--- a/include/sys/rwlock.h
+++ b/include/sys/rwlock.h
@@ -52,9 +52,9 @@ spl_rw_set_owner(krwlock_t *rwp)
{
unsigned long flags;
- spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
rwp->rw_owner = current;
- spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
}
static inline void
@@ -62,9 +62,9 @@ spl_rw_clear_owner(krwlock_t *rwp)
{
unsigned long flags;
- spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
rwp->rw_owner = NULL;
- spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
}
static inline kthread_t *
@@ -73,9 +73,9 @@ rw_owner(krwlock_t *rwp)
unsigned long flags;
kthread_t *owner;
- spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
owner = rwp->rw_owner;
- spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
+ spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
return owner;
}
@@ -187,14 +187,14 @@ extern int __down_write_trylock_locked(struct rw_semaphore *);
unsigned long _flags_; \
int _rc_ = 0; \
\
- spin_lock_irqsave(&SEM(rwp)->wait_lock, _flags_); \
+ spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, _flags_); \
if ((list_empty(&SEM(rwp)->wait_list)) && \
(SEM(rwp)->activity == 1)) { \
__up_read_locked(SEM(rwp)); \
VERIFY(_rc_ = __down_write_trylock_locked(SEM(rwp))); \
(rwp)->rw_owner = current; \
} \
- spin_unlock_irqrestore(&SEM(rwp)->wait_lock, _flags_); \
+ spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, _flags_); \
_rc_; \
})
#else
diff --git a/spl_config.h.in b/spl_config.h.in
index 94e28e7..847da21 100644
--- a/spl_config.h.in
+++ b/spl_config.h.in
@@ -271,6 +271,9 @@
/* rwsem_is_locked() acquires sem->wait_lock */
#undef RWSEM_IS_LOCKED_TAKES_WAIT_LOCK
+/* struct rw_semaphore member wait_lock is raw_spinlock_t */
+#undef RWSEM_SPINLOCK_IS_RAW
+
/* Define the project alias string. */
#undef SPL_META_ALIAS

2
sys-devel/spl/spl-0.6.0_rc6-r1.ebuild → sys-devel/spl/spl-0.6.0_rc6-r2.ebuild
View File

@ -28,6 +28,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
# Pinkbyte: fix build issue with 3.1 kernel
epatch "${FILESDIR}"/${PN}-0.6.0-kernel-3.1-compat.patch
# Pinkbyte: add compatibility with 3.2 kernel
epatch "${FILESDIR}"/${PN}-0.6.0-kernel-3.2-compat.patch
#
eautoreconf
# cd "${WORKDIR}"

46
sys-devel/spl/spl-0.6.0_rc6.ebuild
View File

@ -1,46 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
WANT_AUTOMAKE="1.11"
AT_M4DIR=./config # for aclocal called by eautoreconf
inherit linux-info eutils autotools
DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs"
HOMEPAGE="http://zfsonlinux.org"
SRC_URI="http://github.com/downloads/zfsonlinux/${PN}/${P/_/-}.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~amd64 -x86"
IUSE=""
DEPEND="
virtual/linux-sources
"
RDEPEND=""
S="${WORKDIR}/${P/_/-}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
eautoreconf
# cd "${WORKDIR}"
# ./autogen.sh
}
src_configure() {
set_arch_to_kernel
econf \
--with-config=all \
--with-linux="${KV_OUT_DIR}" \
--with-linux-obj="${KV_OUT_DIR}"
}
src_install() {
emake DESTDIR="${D}" install || die 'emake install failed'
dosym /usr/include/spl/spl_config.h /usr/include/spl/module/spl_config.h \
|| die
}

3
sys-fs/zfs/Manifest
View File

@ -1,7 +1,8 @@
AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d
AUX zfs-0.6.0-kernel-3.1-compat.patch 13773 RMD160 8fc8d5c5a3650c775fd2b6c954dc4a9a66a24bd8 SHA1 57d82b8ff26847f0eb202eccdc26eafa1ddbc270 SHA256 348c0b1a46490d63061478898c88c4164f20ce687eeb3af898578263e4329c2e
AUX zfs-0.6.0-kernel-3.2-compat.patch 44345 RMD160 d6a3c936d4dd22e6c7c8b58c4c05d2d2a613c268 SHA1 44b8fa5afe50e951a5142aa5af81586fb0e3f290 SHA256 3d1afb6c1b65b5d01d9a78dd1957273b5ea487a555a8a129c5bf70091b23df9d
AUX zfs-9999-includedir.patch 601 RMD160 a75d2aca63f0b94a88003a9361c54cf54e77b533 SHA1 f0c60696b6bdfb349897c9b936ffb33b48a70cbf SHA256 d13c30e83548482cde91fb3366ab3d53bc5d0a554270c15a213e2dd15ec937ce
AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476
DIST zfs-0.6.0-rc6.tar.gz 1936503 RMD160 c5bcaa967fe70f5c72863f9e230850b37d76b8ce SHA1 70e6d4a6c97281df52e9c91ae577d15637804934 SHA256 b4f72580307d8b81fa9568fd46dccc993367402bf085adb9eca4dd1a24f323e0
EBUILD zfs-0.6.0_rc6-r1.ebuild 1690 RMD160 e0e50f6aed9a5ec69166c7787e60cac9263b4c3a SHA1 37e25488c24b19dfc705528c279f4fbf6a043ca1 SHA256 7811f99cb2ea15b82f85a334b26bcfc90310ce01ce401495fc86ca67cb07b4fc
EBUILD zfs-0.6.0_rc6-r2.ebuild 1796 RMD160 02b868234d85e13e06f19a5acae6b0fd1d793e32 SHA1 558084a301f83ac59f959a66371c2996318727c5 SHA256 31a286d6a29996c39a4b633c682f0c4dea660160a317478d7e6599c519a34d78
EBUILD zfs-9999.ebuild 1478 RMD160 74c3c243479e0a5e648c8d20122bfe7802438c8a SHA1 245a203a145160d9fcb7a349fe12b28f291e836a SHA256 d94e9a20286df8ed2f407b08e3d71a29b24d8af5fbba20869a8bc7f7505f296c

1211
sys-fs/zfs/files/zfs-0.6.0-kernel-3.2-compat.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
sys-fs/zfs/zfs-0.6.0_rc6-r1.ebuild → sys-fs/zfs/zfs-0.6.0_rc6-r2.ebuild
View File

@ -42,6 +42,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-0.6.0-includedir.patch"
# Pinkbyte: patch for kernel 3.1 compatibility
epatch "${FILESDIR}/${PN}-0.6.0-kernel-3.1-compat.patch"
# Pinkbyte: patch for kernel 3.2 compatibility
epatch "${FILESDIR}/${PN}-0.6.0-kernel-3.2-compat.patch"
#
eautoreconf
}