aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2013-04-23 11:43:05 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2013-04-23 11:43:05 +0400
commit8f38247f6ea8e15806132f2b3ebc75f6d331d9e5 (patch)
treeb3b8ae6b2d2f86f7b9ec226e390c740f6200508c
parentFix zfs-osd build (diff)
downloadsci-8f38247f6ea8e15806132f2b3ebc75f6d331d9e5.tar.gz
sci-8f38247f6ea8e15806132f2b3ebc75f6d331d9e5.tar.bz2
sci-8f38247f6ea8e15806132f2b3ebc75f6d331d9e5.zip
Add rebased patches
Package-Manager: portage-2.2.0_alpha173 RepoMan-Options: --force
-rw-r--r--sys-cluster/lustre/ChangeLog19
-rw-r--r--sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch2
-rw-r--r--sys-cluster/lustre/files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch2
-rw-r--r--sys-cluster/lustre/files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch2
-rw-r--r--sys-cluster/lustre/files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch2
-rw-r--r--sys-cluster/lustre/files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch6
-rw-r--r--sys-cluster/lustre/files/0006-LU-2800-llite-introduce-local-getname.patch2
-rw-r--r--sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch2
-rw-r--r--sys-cluster/lustre/files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch2
-rw-r--r--sys-cluster/lustre/files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch55
-rw-r--r--sys-cluster/lustre/files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch2
-rw-r--r--sys-cluster/lustre/files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch2
-rw-r--r--sys-cluster/lustre/files/0012-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch (renamed from sys-cluster/lustre/files/0013-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch)4
-rw-r--r--sys-cluster/lustre/files/0013-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch (renamed from sys-cluster/lustre/files/0012-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch)4
-rw-r--r--sys-cluster/lustre/lustre-9999.ebuild14
15 files changed, 62 insertions, 58 deletions
diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index fa2cda829..418a4bf49 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -2,6 +2,25 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org>
+ +files/0012-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch,
+ +files/0013-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch,
+ -files/0012-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch,
+ -files/0013-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch,
+ files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+ files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch,
+ files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch,
+ files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch,
+ files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch,
+ files/0006-LU-2800-llite-introduce-local-getname.patch,
+ files/0007-LU-2987-llite-rcu-free-inode.patch,
+ files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch,
+ files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch,
+ files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch,
+ files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch,
+ lustre-9999.ebuild:
+ Add rebased patches
+
22 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> lustre-9999.ebuild:
Fix zfs-osd build
diff --git a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
index acb8aed4f..c4f19b0db 100644
--- a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
+++ b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
@@ -1,4 +1,4 @@
-From affa65ad873b40c6955c05378f8281b76f152644 Mon Sep 17 00:00:00 2001
+From 29c00d6083612106ff71041f04c9c5d57a80f102 Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Mon, 18 Mar 2013 16:22:27 +0400
Subject: [PATCH 01/13] LU-2982 build: make AC check for linux arch sandbox
diff --git a/sys-cluster/lustre/files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch b/sys-cluster/lustre/files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch
index 38209394b..8ed8d9a56 100644
--- a/sys-cluster/lustre/files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch
+++ b/sys-cluster/lustre/files/0002-LU-1812-kernel-3.0-SuSE-and-3.6-FC18-server-patches.patch
@@ -1,4 +1,4 @@
-From ac2426ce1a31fba4d47c3606622553e98867e7f3 Mon Sep 17 00:00:00 2001
+From 63af3a0a24703ae6a818c801ba70023995ebc7d3 Mon Sep 17 00:00:00 2001
From: James Simmons <uja.ornl@gmail.com>
Date: Tue, 9 Apr 2013 11:26:00 -0400
Subject: [PATCH 02/13] LU-1812 kernel: 3.0/SuSE and 3.6/FC18 server patches
diff --git a/sys-cluster/lustre/files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch b/sys-cluster/lustre/files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch
index 3c8976d3d..1332ac8ad 100644
--- a/sys-cluster/lustre/files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch
+++ b/sys-cluster/lustre/files/0003-LU-2686-kernel-sock_map_fd-replaced-by-sock_alloc_fi.patch
@@ -1,4 +1,4 @@
-From 2b5c323ddaee25e6fae99dca6f042958903d1a5f Mon Sep 17 00:00:00 2001
+From 165b74cfea18405a1ad0a01ed1c3ea946f9d8ce5 Mon Sep 17 00:00:00 2001
From: yangsheng <yang.sheng@intel.com>
Date: Mon, 8 Apr 2013 21:14:09 +0800
Subject: [PATCH 03/13] LU-2686 kernel: sock_map_fd() replaced by
diff --git a/sys-cluster/lustre/files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch b/sys-cluster/lustre/files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch
index 44bd32606..f119c9bb6 100644
--- a/sys-cluster/lustre/files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch
+++ b/sys-cluster/lustre/files/0004-LU-2686-kernel-Kernel-update-for-3.7.2-201.fc18.patch
@@ -1,4 +1,4 @@
-From 5d200066e79329977b80dae1b824fb56f8a8e2c4 Mon Sep 17 00:00:00 2001
+From dc6776e7aab810ff4db384de86c323e80649dc7c Mon Sep 17 00:00:00 2001
From: yangsheng <yang.sheng@intel.com>
Date: Mon, 8 Apr 2013 21:04:22 +0800
Subject: [PATCH 04/13] LU-2686 kernel: Kernel update for 3.7.2-201.fc18
diff --git a/sys-cluster/lustre/files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch b/sys-cluster/lustre/files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
index fd11603de..4d1637762 100644
--- a/sys-cluster/lustre/files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
+++ b/sys-cluster/lustre/files/0005-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
@@ -1,4 +1,4 @@
-From 6ccd0a77a72119e7ac09978829a2ce1aa47863e0 Mon Sep 17 00:00:00 2001
+From 6e14a93978fe30cbc424fc727f26354172756afd Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Wed, 20 Mar 2013 17:33:17 -0400
Subject: [PATCH 05/13] LU-2850 compat: posix_acl_{to,from}_xattr take
@@ -134,7 +134,7 @@ index f9e425d..7e3eb53 100644
RETURN(rc);
}
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
-index 9f3dea4..c9aa7a0 100644
+index f068026..ce18acf 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -41,6 +41,7 @@
@@ -145,7 +145,7 @@ index 9f3dea4..c9aa7a0 100644
#else
# include <liblustre.h>
#endif
-@@ -465,7 +466,7 @@ static int mdc_unpack_acl(struct ptlrpc_request *req, struct lustre_md *md)
+@@ -470,7 +471,7 @@ static int mdc_unpack_acl(struct ptlrpc_request *req, struct lustre_md *md)
if (!buf)
RETURN(-EPROTO);
diff --git a/sys-cluster/lustre/files/0006-LU-2800-llite-introduce-local-getname.patch b/sys-cluster/lustre/files/0006-LU-2800-llite-introduce-local-getname.patch
index b1be5add4..55bf18b86 100644
--- a/sys-cluster/lustre/files/0006-LU-2800-llite-introduce-local-getname.patch
+++ b/sys-cluster/lustre/files/0006-LU-2800-llite-introduce-local-getname.patch
@@ -1,4 +1,4 @@
-From 1e9898786864f75f45cd50c31148b08b5697647d Mon Sep 17 00:00:00 2001
+From 5bde36648a5be0e425b93de1558cf91f3250ea65 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Tue, 19 Mar 2013 21:18:32 -0400
Subject: [PATCH 06/13] LU-2800 llite: introduce local getname()
diff --git a/sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch b/sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch
index b441c4623..a07c3db71 100644
--- a/sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch
+++ b/sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch
@@ -1,4 +1,4 @@
-From fe121caa09062ce512e7b4733d3f253dbae475dc Mon Sep 17 00:00:00 2001
+From a6906bd6e814b95d37770f136bed99aa6481444c Mon Sep 17 00:00:00 2001
From: Peng Tao <tao.peng@emc.com>
Date: Tue, 19 Mar 2013 14:04:47 +0800
Subject: [PATCH 07/13] LU-2987 llite: rcu-free inode
diff --git a/sys-cluster/lustre/files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch b/sys-cluster/lustre/files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
index 3f6fcd1ce..2cb9ddb64 100644
--- a/sys-cluster/lustre/files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
+++ b/sys-cluster/lustre/files/0008-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
@@ -1,4 +1,4 @@
-From 6cc1686b5c1fed6e7ddfd72cfd4e01dc3eac696e Mon Sep 17 00:00:00 2001
+From 840f014f874952b091ae9a05c2d5e262549aad5e Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Wed, 17 Apr 2013 13:27:55 +0400
Subject: [PATCH 08/13] LU-2850 kernel: 3.8 upstream removes vmtruncate()
diff --git a/sys-cluster/lustre/files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch b/sys-cluster/lustre/files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
index 50480b4b8..88a98e742 100644
--- a/sys-cluster/lustre/files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
+++ b/sys-cluster/lustre/files/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
@@ -1,4 +1,4 @@
-From 56d9f2bdeacf3d4f1a78cd5cac53436cce00014e Mon Sep 17 00:00:00 2001
+From fe026adf859311df9a8b329e37d00fb4296aad46 Mon Sep 17 00:00:00 2001
From: Peng Tao <tao.peng@emc.com>
Date: Mon, 18 Mar 2013 10:47:57 +0800
Subject: [PATCH 09/13] LU-2850 kernel: 3.8 upstream kills daemonize()
@@ -37,7 +37,7 @@ Change-Id: I9f977bfc5d58192957d8c8d634204f4910edfa2a
libcfs/libcfs/winnt/winnt-prim.c | 27 ++++------
libcfs/libcfs/winnt/winnt-tcpip.c | 8 +--
libcfs/libcfs/workitem.c | 26 +++++-----
- lnet/klnds/gnilnd/gnilnd_cb.c | 4 --
+ lnet/klnds/gnilnd/gnilnd_cb.c | 3 --
lnet/klnds/gnilnd/gnilnd_conn.c | 6 ---
lnet/klnds/gnilnd/gnilnd_stack.c | 1 -
lnet/klnds/mxlnd/mxlnd.c | 34 ++++++++-----
@@ -85,7 +85,7 @@ Change-Id: I9f977bfc5d58192957d8c8d634204f4910edfa2a
lustre/quota/qmt_lock.c | 17 +++----
lustre/quota/qsd_reint.c | 6 +--
lustre/quota/qsd_writeback.c | 16 +++---
- 68 files changed, 515 insertions(+), 745 deletions(-)
+ 68 files changed, 515 insertions(+), 744 deletions(-)
delete mode 100644 libcfs/libcfs/linux/linux-lwt.c
diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
@@ -824,10 +824,10 @@ index db839e5..309cfec 100644
CERROR("Failed to create thread for WI scheduler %s: %d\n",
name, rc);
diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
-index 56be88a..53d8337 100644
+index 381aa64..a4407de 100644
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
-@@ -2609,7 +2609,6 @@ kgnilnd_reaper(void *arg)
+@@ -2946,7 +2946,6 @@ kgnilnd_reaper(void *arg)
struct timer_list timer;
DEFINE_WAIT(wait);
@@ -835,13 +835,7 @@ index 56be88a..53d8337 100644
cfs_block_allsigs();
/* all gnilnd threads need to run fairly urgently */
-@@ -4247,14 +4246,11 @@ kgnilnd_scheduler(void *arg)
- {
- int threadno = (long)arg;
- kgn_device_t *dev;
-- char name[16];
- int busy_loops = 0;
- DEFINE_WAIT(wait);
+@@ -4857,8 +4856,6 @@ kgnilnd_scheduler(void *arg)
dev = &kgnilnd_data.kgn_devices[(threadno + 1) % kgnilnd_data.kgn_ndevs];
@@ -851,10 +845,10 @@ index 56be88a..53d8337 100644
/* all gnilnd threads need to run fairly urgently */
diff --git a/lnet/klnds/gnilnd/gnilnd_conn.c b/lnet/klnds/gnilnd/gnilnd_conn.c
-index 38aee5b..a64ed3f 100644
+index 39716b8..a513ccd 100644
--- a/lnet/klnds/gnilnd/gnilnd_conn.c
+++ b/lnet/klnds/gnilnd/gnilnd_conn.c
-@@ -2157,13 +2157,10 @@ int
+@@ -2167,13 +2167,10 @@ int
kgnilnd_dgram_waitq(void *arg)
{
kgn_device_t *dev = (kgn_device_t *) arg;
@@ -868,7 +862,7 @@ index 38aee5b..a64ed3f 100644
cfs_block_allsigs();
/* all gnilnd threads need to run fairly urgently */
-@@ -2312,15 +2309,12 @@ int
+@@ -2345,7 +2342,6 @@ int
kgnilnd_dgram_mover(void *arg)
{
kgn_device_t *dev = (kgn_device_t *)arg;
@@ -876,7 +870,8 @@ index 38aee5b..a64ed3f 100644
int rc, did_something;
unsigned long next_purge_check = jiffies - 1;
unsigned long timeout;
- struct timer_list timer;
+@@ -2353,8 +2349,6 @@ kgnilnd_dgram_mover(void *arg)
+ unsigned long deadline = 0;
DEFINE_WAIT(wait);
- snprintf(name, sizeof(name), "kgnilnd_dg_%02d", dev->gnd_id);
@@ -885,10 +880,10 @@ index 38aee5b..a64ed3f 100644
/* all gnilnd threads need to run fairly urgently */
set_user_nice(current, *kgnilnd_tunables.kgn_nice);
diff --git a/lnet/klnds/gnilnd/gnilnd_stack.c b/lnet/klnds/gnilnd/gnilnd_stack.c
-index 10ae493..9dbc3a1 100644
+index 0dec950..7414233 100644
--- a/lnet/klnds/gnilnd/gnilnd_stack.c
+++ b/lnet/klnds/gnilnd/gnilnd_stack.c
-@@ -362,7 +362,6 @@ kgnilnd_ruhroh_thread(void *arg)
+@@ -366,7 +366,6 @@ kgnilnd_ruhroh_thread(void *arg)
int i = 1;
DEFINE_WAIT(wait);
@@ -1729,10 +1724,10 @@ index cc8c4c8..d4d5027 100644
usock_data.ud_state = UD_STATE_INITIALIZED;
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
-index 2e3a1d5..e61583a 100644
+index d89a90f..a497771 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
-@@ -1975,19 +1975,12 @@ static int target_recovery_thread(void *arg)
+@@ -1971,19 +1971,12 @@ static int target_recovery_thread(void *arg)
struct ptlrpc_request *req;
struct target_recovery_data *trd = &obd->obd_recovery_data;
unsigned long delta;
@@ -1753,7 +1748,7 @@ index 2e3a1d5..e61583a 100644
OBD_ALLOC_PTR(thread);
if (thread == NULL)
RETURN(-ENOMEM);
-@@ -2112,22 +2105,24 @@ static int target_recovery_thread(void *arg)
+@@ -2108,22 +2101,24 @@ static int target_recovery_thread(void *arg)
static int target_start_recovery_thread(struct lu_target *lut,
svc_handler_t handler)
{
@@ -2193,10 +2188,10 @@ index 6d5b7af..3211557 100644
thread_set_flags(thread, SVC_STOPPED);
thread_set_flags(&sai->sai_agl_thread, SVC_STOPPED);
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
-index c9aa7a0..ead4bcf 100644
+index ce18acf..b9ad1b9 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
-@@ -1566,13 +1566,6 @@ static int mdc_changelog_send_thread(void *csdata)
+@@ -1571,13 +1571,6 @@ static int mdc_changelog_send_thread(void *csdata)
CDEBUG(D_CHANGELOG, "changelog to fp=%p start "LPU64"\n",
cs->cs_fp, cs->cs_startrec);
@@ -2210,7 +2205,7 @@ index c9aa7a0..ead4bcf 100644
OBD_ALLOC(cs->cs_buf, CR_MAXSIZE);
if (cs->cs_buf == NULL)
GOTO(out, rc = -ENOMEM);
-@@ -1609,12 +1602,10 @@ out:
+@@ -1614,12 +1607,10 @@ out:
llog_cat_close(NULL, llh);
if (ctxt)
llog_ctxt_put(ctxt);
@@ -2227,7 +2222,7 @@ index c9aa7a0..ead4bcf 100644
}
static int mdc_ioc_changelog_send(struct obd_device *obd,
-@@ -1634,13 +1625,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
+@@ -1639,13 +1630,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
cs->cs_fp = fget(icc->icc_id);
cs->cs_flags = icc->icc_flags;
@@ -2803,10 +2798,10 @@ index 7634d22..595f710 100644
l_wait_event(sec_gc_thread.t_ctl_waitq,
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
-index 63fee6d..7d73b13 100644
+index c141f49..8d52419 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
-@@ -2362,7 +2362,7 @@ static int ptlrpc_main(void *arg)
+@@ -2397,7 +2397,7 @@ static int ptlrpc_main(void *arg)
ENTRY;
thread->t_pid = cfs_curproc_pid();
@@ -2815,7 +2810,7 @@ index 63fee6d..7d73b13 100644
/* NB: we will call cfs_cpt_bind() for all threads, because we
* might want to run lustre server only on a subset of system CPUs,
-@@ -2557,7 +2557,7 @@ static int ptlrpc_hr_main(void *arg)
+@@ -2592,7 +2592,7 @@ static int ptlrpc_hr_main(void *arg)
snprintf(threadname, sizeof(threadname), "ptlrpc_hr%02d_%03d",
hrp->hrp_cpt, hrt->hrt_id);
@@ -2824,7 +2819,7 @@ index 63fee6d..7d73b13 100644
rc = cfs_cpt_bind(ptlrpc_hr.hr_cpt_table, hrp->hrp_cpt);
if (rc != 0) {
-@@ -2623,10 +2623,13 @@ static int ptlrpc_start_hr_threads(void)
+@@ -2658,10 +2658,13 @@ static int ptlrpc_start_hr_threads(void)
int rc = 0;
for (j = 0; j < hrp->hrp_nthrs; j++) {
@@ -2842,7 +2837,7 @@ index 63fee6d..7d73b13 100644
break;
}
cfs_wait_event(ptlrpc_hr.hr_waitq,
-@@ -2818,8 +2821,8 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait)
+@@ -2853,8 +2856,8 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait)
* CLONE_VM and CLONE_FILES just avoid a needless copy, because we
* just drop the VM and FILES in cfs_daemonize_ctxt() right away.
*/
diff --git a/sys-cluster/lustre/files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch b/sys-cluster/lustre/files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
index c5df7b0ae..1e56bb0c8 100644
--- a/sys-cluster/lustre/files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
+++ b/sys-cluster/lustre/files/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
@@ -1,4 +1,4 @@
-From 5e887c3185fc9d121da608d5e5733825edda72d9 Mon Sep 17 00:00:00 2001
+From 25de8fa499a714c6ef1f1f7f160b2bb9ee999d1d Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Sun, 31 Mar 2013 19:32:30 +0400
Subject: [PATCH 10/13] LU-3079 kernel: 3.9 hlist_for_each_entry uses 3 args
diff --git a/sys-cluster/lustre/files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch b/sys-cluster/lustre/files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch
index d6a199c90..c04139993 100644
--- a/sys-cluster/lustre/files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch
+++ b/sys-cluster/lustre/files/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch
@@ -1,4 +1,4 @@
-From 74b8489747394fe4aee90912a0f5718eaa368f6c Mon Sep 17 00:00:00 2001
+From 71c27957c6f925c571db9ea0850e0adcbbb1540a Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Sun, 31 Mar 2013 20:13:21 +0400
Subject: [PATCH 11/13] LU-3079 kernel: f_vfsmnt replaced by f_path.mnt
diff --git a/sys-cluster/lustre/files/0013-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch b/sys-cluster/lustre/files/0012-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch
index df8f4825a..bca27ede7 100644
--- a/sys-cluster/lustre/files/0013-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch
+++ b/sys-cluster/lustre/files/0012-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch
@@ -1,7 +1,7 @@
-From 1eeb196b3315447fe81b2aa5a916f791e32b4fd5 Mon Sep 17 00:00:00 2001
+From b8082dba90589573713e521935f07dd78bf39461 Mon Sep 17 00:00:00 2001
From: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Date: Tue, 16 Apr 2013 19:21:13 +0400
-Subject: [PATCH 13/13] LU-3179 fids: fix compilation error with gcc 4.7.2
+Subject: [PATCH 12/13] LU-3179 fids: fix compilation error with gcc 4.7.2
initialize oi.oi.oi_id which gcc 4.7.2 is afraid of being
used later.
diff --git a/sys-cluster/lustre/files/0012-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch b/sys-cluster/lustre/files/0013-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch
index 31e5f6a0d..f6f3bbf47 100644
--- a/sys-cluster/lustre/files/0012-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch
+++ b/sys-cluster/lustre/files/0013-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch
@@ -1,7 +1,7 @@
-From a450f84644df523d0473305219ed81a300d743cc Mon Sep 17 00:00:00 2001
+From 4d081a6db49068649612223a7d47c3a72c0875d0 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 28 Mar 2013 12:18:27 -0700
-Subject: [PATCH 12/13] LU-3117 build: zfs-0.6.1 kmod+dkms compatibility
+Subject: [PATCH 13/13] LU-3117 build: zfs-0.6.1 kmod+dkms compatibility
With the release of zfs-0.6.1 the default install location of
the zfs kmod headers and objects has changed. The kmod headers
diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index bac140d1b..6905f896d 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -44,8 +44,8 @@ PATCHES=(
"${FILESDIR}/0009-LU-2850-kernel-3.8-upstream-kills-daemonize.patch"
"${FILESDIR}/0010-LU-3079-kernel-3.9-hlist_for_each_entry-uses-3-args.patch"
"${FILESDIR}/0011-LU-3079-kernel-f_vfsmnt-replaced-by-f_path.mnt.patch"
- "${FILESDIR}/0012-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch"
- "${FILESDIR}/0013-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch"
+ "${FILESDIR}/0012-LU-3179-fids-fix-compilation-error-with-gcc-4.7.2.patch"
+ "${FILESDIR}/0013-LU-3117-build-zfs-0.6.1-kmod-dkms-compatibility.patch"
)
pkg_setup() {
@@ -56,16 +56,6 @@ pkg_setup() {
src_prepare() {
epatch ${PATCHES[@]}
- # fix libzfs lib name we have it as libzfs.so.1
- sed -e 's:libzfs.so:libzfs.so.1:g' \
- -e 's:libnvpair.so:libnvpair.so.1:g' \
- -i lustre/utils/mount_utils_zfs.c || die
-
- # fix some install paths
- sed -e "s:$\(sysconfdir\)/udev:$(get_udevdir):g" \
- -e "s:$\(sysconfdir\)/sysconfig:$\(sysconfdir\)/conf.d:g" \
- -i lustre/conf/Makefile.am || die
-
# replace upstream autogen.sh by our src_prepare()
local DIRS="libcfs lnet lustre snmp"
local ACLOCAL_FLAGS