From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 63800198005 for ; Mon, 18 Mar 2013 23:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3523E05BE; Mon, 18 Mar 2013 23:15:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F459E05BE for ; Mon, 18 Mar 2013 23:15:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4489F33DAF8 for ; Mon, 18 Mar 2013 23:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6646E4073 for ; Mon, 18 Mar 2013 23:14:57 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1363648476.d874bf1da9f1d039fc4803d42ee3eced6f487371.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/lustre/ChangeLog sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch sys-cluster/lustre/files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch sys-cluster/lustre/files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch sys-cluster/lustre/files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch X-VCS-Directories: sys-cluster/lustre/ sys-cluster/lustre/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: d874bf1da9f1d039fc4803d42ee3eced6f487371 X-VCS-Branch: master Date: Mon, 18 Mar 2013 23:14:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4559e639-3edf-4e37-8c32-20de67241e0e X-Archives-Hash: 6e32a2a9c5fdac6147541ae9284d2fd3 commit: d874bf1da9f1d039fc4803d42ee3eced6f487371 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Mar 18 23:14:36 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Mar 18 23:14:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d874bf1d Update patches Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- sys-cluster/lustre/ChangeLog | 9 +++++ ...ld-check-header-files-in-generated-uapi-d.patch | 4 +- ...-kernel-3.7-kernel-posix-acl-needs-userns.patch | 32 ++++++++++---------- ...3-LU-2850-kernel-3.7-uneports-sock_map_fd.patch | 2 +- ...rnel-3.7-get-putname-uses-struct-filename.patch | 2 +- ...50-kernel-3.8-upstream-removes-vmtruncate.patch | 2 +- ...-2850-kernel-3.8-upstream-kills-daemonize.patch | 10 +++--- 7 files changed, 35 insertions(+), 26 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index a601dac..25c0274 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Mar 2013; Alexey Shvetsov + files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch, + files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch, + files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch, + files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch, + files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch, + files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch: + Update patches + 18 Mar 2013; Alexey Shvetsov lustre-9999.ebuild: Fix some install path diff --git a/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch b/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch index 418dd60..66c5f1d 100644 --- a/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch +++ b/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch @@ -1,4 +1,4 @@ -From ef79b13b6424e5b34052c56043da2ec02e50a392 Mon Sep 17 00:00:00 2001 +From 44ddcf216f650c119d8b376ec70a9163cbb47506 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 27 Feb 2013 18:29:34 +0800 Subject: [PATCH 1/6] LU-2850 build: check header files in generated uapi dir @@ -17,7 +17,7 @@ Change-Id: Ib104919189ebc0af7d3b5e9ca3b866b3b98be3dc 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am -index 883d13c..8f3518b 100644 +index 8a259bc..6cc5f6d 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -84,7 +84,7 @@ all-am: modules diff --git a/sys-cluster/lustre/files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch b/sys-cluster/lustre/files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch index 67715de..8daaa4f 100644 --- a/sys-cluster/lustre/files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch +++ b/sys-cluster/lustre/files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch @@ -1,6 +1,6 @@ -From 4cc5a5711dea1e5bebd2cd1812955cc0cf84a8ac Mon Sep 17 00:00:00 2001 +From a1552cbe3d0ea36cdc3959db91a8edb19589cf96 Mon Sep 17 00:00:00 2001 From: Peng Tao -Date: Tue, 26 Feb 2013 16:31:44 +0800 +Date: Mon, 11 Mar 2013 11:17:12 +0800 Subject: [PATCH 2/6] LU-2850 kernel: 3.7 kernel posix acl needs userns With upstream commit 5f3a4a28, kernel posix acl adds support @@ -10,10 +10,10 @@ Signed-off-by: Peng Tao Change-Id: I7d82c51c482daae8a7dbb526b8d72eea2bcf0650 --- lustre/autoconf/lustre-core.m4 | 26 ++++++++++++++++++++++++++ - lustre/include/liblustre.h | 11 ++++++++++- + lustre/include/liblustre.h | 9 ++++++++- lustre/llite/xattr.c | 6 +++++- lustre/mdc/mdc_request.c | 6 +++++- - 4 files changed, 46 insertions(+), 3 deletions(-) + 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 3c773e8..38d26a3 100644 @@ -67,28 +67,28 @@ index 3c773e8..38d26a3 100644 if test x$enable_server = xyes ; then AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h -index 14f3ef6..be4652e 100644 +index 14f3ef6..50e5f35 100644 --- a/lustre/include/liblustre.h +++ b/lustre/include/liblustre.h -@@ -452,8 +452,17 @@ static inline size_t posix_acl_xattr_size(int count) - sizeof(posix_acl_xattr_entry); +@@ -453,10 +453,17 @@ static inline size_t posix_acl_xattr_size(int count) } -+#ifdef HAVE_POSIX_ACL_NAMESPACE -+struct user_namespace {}; -+struct user_namespace init_user_ns; -+ -+static inline -+struct posix_acl *posix_acl_from_xattr(struct user_namespace *user_ns, -+ const void *value, size_t size) -+#else static inline -struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) +struct posix_acl *posix_acl_from_xattr(const void *value, size_t size) -+#endif { return NULL; } ++#ifdef HAVE_POSIX_ACL_NAMESPACE ++/* ++ * Mask out &init_user_ns so we don't jump through hoops to define it somehow ++ * only to have it ignored anyway. ++ */ ++#define posix_acl_from_xattr(a,b,c) posix_acl_from_xattr(b,c) ++#endif + + static inline + int posix_acl_valid(const struct posix_acl *acl) diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c index 24a89eb..d0349e2 100644 --- a/lustre/llite/xattr.c diff --git a/sys-cluster/lustre/files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch b/sys-cluster/lustre/files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch index 60e2f0f..e2f7c17 100644 --- a/sys-cluster/lustre/files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch +++ b/sys-cluster/lustre/files/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch @@ -1,4 +1,4 @@ -From 44bfa4137340d5748aa4aa973f8ef444885ab790 Mon Sep 17 00:00:00 2001 +From 44034bc1deb0f1320693b605ab5c7c240f70df01 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 26 Feb 2013 17:09:15 +0800 Subject: [PATCH 3/6] LU-2850 kernel: 3.7 uneports sock_map_fd diff --git a/sys-cluster/lustre/files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch b/sys-cluster/lustre/files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch index c488db0..dae020b 100644 --- a/sys-cluster/lustre/files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch +++ b/sys-cluster/lustre/files/0004-LU-2850-kernel-3.7-get-putname-uses-struct-filename.patch @@ -1,4 +1,4 @@ -From e4706fbb2bad8b3d1f4f99fbcd5a3dd8513dea6b Mon Sep 17 00:00:00 2001 +From eb13282efadf49a467e151d1d9c6ede64ab0b367 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 27 Feb 2013 17:51:46 +0800 Subject: [PATCH 4/6] LU-2850 kernel: 3.7 get/putname uses struct filename diff --git a/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch b/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch index baed44a..d9ed196 100644 --- a/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch +++ b/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch @@ -1,4 +1,4 @@ -From e40d49bfbbda8196e29d98e380d012ff9d9c3639 Mon Sep 17 00:00:00 2001 +From 6cc48af286a737552bfdb15b8566ecabb32e6642 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 26 Feb 2013 18:09:42 +0800 Subject: [PATCH 5/6] LU-2850 kernel: 3.8 upstream removes vmtruncate() diff --git a/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch index cacc590..a5e7a25 100644 --- a/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch +++ b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch @@ -1,4 +1,4 @@ -From 45927457c2d276951ad1cbf4da785160b36ae3f8 Mon Sep 17 00:00:00 2001 +From 5f24e2d6b03fd8ef42fbfbd94c11e8640417e3f0 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Mon, 18 Mar 2013 10:47:57 +0800 Subject: [PATCH 6/6] LU-2850 kernel: 3.8 upstream kills daemonize() @@ -477,10 +477,10 @@ index afb4465..6da1744 100644 EXPORT_SYMBOL(cfs_block_sigs); EXPORT_SYMBOL(cfs_block_sigsinv); diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c -index f31e000..5059f47 100644 +index d455e42..f874974 100644 --- a/libcfs/libcfs/tracefile.c +++ b/libcfs/libcfs/tracefile.c -@@ -991,7 +991,6 @@ static int tracefiled(void *arg) +@@ -992,7 +992,6 @@ static int tracefiled(void *arg) /* we're started late enough that we pick up init's fs context */ /* this is so broken in uml? what on earth is going on? */ @@ -488,7 +488,7 @@ index f31e000..5059f47 100644 spin_lock_init(&pc.pc_lock); complete(&tctl->tctl_start); -@@ -1105,16 +1104,16 @@ int cfs_trace_start_thread(void) +@@ -1106,16 +1105,16 @@ int cfs_trace_start_thread(void) init_completion(&tctl->tctl_start); init_completion(&tctl->tctl_stop); @@ -1747,7 +1747,7 @@ index 2e3a1d5..e61583a 100644 void target_stop_recovery_thread(struct obd_device *obd) diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c -index 18bbd28..fb4d729 100644 +index 4a75bb0..27a79d9 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -178,7 +178,6 @@ static int expired_lock_main(void *arg)