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 F40A7198005 for ; Thu, 14 Mar 2013 11:57:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0252E0477; Thu, 14 Mar 2013 11:57:58 +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 1E2C8E0477 for ; Thu, 14 Mar 2013 11:57:58 +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 BC735335E30 for ; Thu, 14 Mar 2013 11:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5CFA0E4079 for ; Thu, 14 Mar 2013 11:57:55 +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: <1363261970.aa7798c5dc55b786fe3d71397e897253c1d2c0af.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: aa7798c5dc55b786fe3d71397e897253c1d2c0af X-VCS-Branch: master Date: Thu, 14 Mar 2013 11:57:55 +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: 4f02b4bf-de96-4d0d-b412-7f1228fd6e25 X-Archives-Hash: 5c6f5c63e1ba46714430daab4c69cb7d commit: aa7798c5dc55b786fe3d71397e897253c1d2c0af Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Mar 14 11:52:50 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Mar 14 11:52:50 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aa7798c5 Now it builds and loads with 3.8 Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- sys-cluster/lustre/ChangeLog | 9 +++++++ ...ld-check-header-files-in-generated-uapi-d.patch | 2 +- ...-kernel-3.7-kernel-posix-acl-needs-userns.patch | 20 +++++++++++---- ...3-LU-2850-kernel-3.7-uneports-sock_map_fd.patch | 8 +++--- ...rnel-3.7-get-putname-uses-struct-filename.patch | 25 ++++++++++++-------- ...50-kernel-3.8-upstream-removes-vmtruncate.patch | 8 +++--- ...-2850-kernel-3.8-upstream-kills-daemonize.patch | 6 ++-- 7 files changed, 50 insertions(+), 28 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index e887ab6..a7ad425 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -3,6 +3,15 @@ # $Header: $ 14 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: + Now it builds and loads with 3.8 + + 14 Mar 2013; Alexey Shvetsov files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch: More updates to lustre patches 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 066863b..774f328 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 4a1a152f4250df1773ad5824ce236a30edcb0fd2 Mon Sep 17 00:00:00 2001 +From b19ad19fb93f7461ec9fbe8c9dc5cd8a18bc9230 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 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 19f39db..d9c8e64 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,4 +1,4 @@ -From 4b7ad00fd26de2fb8b94fa94a9b115ec97724b36 Mon Sep 17 00:00:00 2001 +From e9f9ce30714f5b645e59d08e6d1c6dfeae6254d4 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 26 Feb 2013 16:31:44 +0800 Subject: [PATCH 2/6] LU-2850 kernel: 3.7 kernel posix acl needs userns @@ -9,17 +9,25 @@ to user namespace. Signed-off-by: Peng Tao Change-Id: I7d82c51c482daae8a7dbb526b8d72eea2bcf0650 --- - lustre/autoconf/lustre-core.m4 | 25 +++++++++++++++++++++++++ + lustre/autoconf/lustre-core.m4 | 26 ++++++++++++++++++++++++++ lustre/include/liblustre.h | 11 ++++++++++- lustre/llite/xattr.c | 6 +++++- lustre/mdc/mdc_request.c | 6 +++++- - 4 files changed, 45 insertions(+), 3 deletions(-) + 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 -index 3c773e8..323342a 100644 +index 3c773e8..38d26a3 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 -@@ -2213,6 +2213,28 @@ LB_LINUX_TRY_COMPILE([ +@@ -328,6 +328,7 @@ AC_TRY_RUN([ + #define __LINUX_POSIX_ACL_H + + #ifdef CONFIG_FS_POSIX_ACL ++ struct user_namespace; + # include + #endif + +@@ -2213,6 +2214,28 @@ LB_LINUX_TRY_COMPILE([ ]) # @@ -48,7 +56,7 @@ index 3c773e8..323342a 100644 # LC_PROG_LINUX # # Lustre linux kernel checks -@@ -2391,6 +2413,9 @@ AC_DEFUN([LC_PROG_LINUX], +@@ -2391,6 +2414,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_DENTRY_OPEN_USE_PATH LC_HAVE_IOP_ATOMIC_OPEN 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 9cae25b..a50e443 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 fc3eaad30315066fe7936562e6270d18b9811158 Mon Sep 17 00:00:00 2001 +From ff29e7a02c6467bdd235445a071ee299d65e227f 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 @@ -79,10 +79,10 @@ index 0a31b55..c576cdf 100644 int libcfs_ipif_query (char *name, int *up, __u32 *ip, __u32 *mask) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 -index 323342a..3a13190 100644 +index 38d26a3..579ea17 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 -@@ -2235,6 +2235,24 @@ LB_LINUX_TRY_COMPILE([ +@@ -2236,6 +2236,24 @@ LB_LINUX_TRY_COMPILE([ ]) # @@ -107,7 +107,7 @@ index 323342a..3a13190 100644 # LC_PROG_LINUX # # Lustre linux kernel checks -@@ -2415,6 +2433,8 @@ AC_DEFUN([LC_PROG_LINUX], +@@ -2416,6 +2434,8 @@ AC_DEFUN([LC_PROG_LINUX], # 3.7 LC_HAVE_POSIX_ACL_NAMESPACE 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 df891be..56ad53b 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 7fbe22c137037dcfa65eb4e58e6feef7a30f786e Mon Sep 17 00:00:00 2001 +From d162fc8efd5151fac4ac865df2b9d67c5f080ad7 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 @@ -10,17 +10,17 @@ Signed-off-by: Peng Tao Change-Id: Ifc3cfa54220b83b8de5aebfa5464c6efa5525599 --- lustre/autoconf/lustre-core.m4 | 26 ++++++++++++++++++ - lustre/include/linux/lustre_compat25.h | 37 +++++++++++++++++++++++++ + lustre/include/linux/lustre_compat25.h | 42 ++++++++++++++++++++++++++++ lustre/llite/dir.c | 50 +++++++++++++++++----------------- lustre/llite/llite_internal.h | 2 +- lustre/llite/namei.c | 2 +- - 5 files changed, 90 insertions(+), 27 deletions(-) + 5 files changed, 95 insertions(+), 27 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 -index 3a13190..deec2d7 100644 +index 579ea17..9a7a458 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 -@@ -2253,6 +2253,31 @@ AC_DEFUN([LC_HAVE_SOCK_ALLOC_FILE], +@@ -2254,6 +2254,31 @@ AC_DEFUN([LC_HAVE_SOCK_ALLOC_FILE], ]) # @@ -52,7 +52,7 @@ index 3a13190..deec2d7 100644 # LC_PROG_LINUX # # Lustre linux kernel checks -@@ -2435,6 +2460,7 @@ AC_DEFUN([LC_PROG_LINUX], +@@ -2436,6 +2461,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_HAVE_POSIX_ACL_NAMESPACE LC_HAVE_SOCK_MAP_FD LC_HAVE_SOCK_ALLOC_FILE @@ -61,10 +61,10 @@ index 3a13190..deec2d7 100644 # if test x$enable_server = xyes ; then diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h -index d25c168..2804183 100644 +index d25c168..dcd4a4f 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h -@@ -750,4 +750,41 @@ static inline struct dentry *d_make_root(struct inode *root) +@@ -750,4 +750,46 @@ static inline struct dentry *d_make_root(struct inode *root) } #endif @@ -99,9 +99,14 @@ index d25c168..2804183 100644 +{ + return getname(name); +} -+static inline void ll_putname(struct filename *filename) ++static inline void ll_putname(struct filename *name) +{ -+ putname(filename); ++ if (name->separate) { ++ __putname(name->name); ++ kfree(name); ++ } else { ++ __putname(name); ++ } +} +#endif /* !HAVE_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 c3e66fc..3d4ad6d 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 5c27eb8309b371907eecd4f5666d513f159c6842 Mon Sep 17 00:00:00 2001 +From 20c2e930f8317a0500d08f5f15716719113d8a5b 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() @@ -14,10 +14,10 @@ Change-Id: I9d4f43a5c181f16482b4caa021ba7a09ee52b600 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 -index deec2d7..94e57f0 100644 +index 9a7a458..c87afb0 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 -@@ -2278,6 +2278,26 @@ EXTRA_KCFLAGS="$tmp_flags" +@@ -2279,6 +2279,26 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # @@ -44,7 +44,7 @@ index deec2d7..94e57f0 100644 # LC_PROG_LINUX # # Lustre linux kernel checks -@@ -2462,6 +2482,9 @@ AC_DEFUN([LC_PROG_LINUX], +@@ -2463,6 +2483,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_HAVE_SOCK_ALLOC_FILE LC_HAVE_STRUCT_FILENAME 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 cae2018..8b990df 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 a8b409cdbb7a95d34746a1d8d387eafc28776a24 Mon Sep 17 00:00:00 2001 +From 6c10836164d76c6efea7253768d4e18c408a7d6a Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 14 Mar 2013 09:51:17 +0800 Subject: [PATCH 6/6] LU-2850 kernel: 3.8 upstream kills daemonize() @@ -413,7 +413,7 @@ index d9d4dc1..0000000 -} -EXPORT_SYMBOL(cfs_create_thread); diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c -index afb4465..7e23256 100644 +index afb4465..d5d62d7 100644 --- a/libcfs/libcfs/linux/linux-prim.c +++ b/libcfs/libcfs/linux/linux-prim.c @@ -259,34 +259,19 @@ void cfs_enter_debugger(void) @@ -469,7 +469,7 @@ index afb4465..7e23256 100644 -EXPORT_SYMBOL(cfs_daemonize); -EXPORT_SYMBOL(cfs_daemonize_ctxt); +#ifndef HAVE_UNSHARE_FS_STRUCT -+ EXPORT_SYMBOL(unshare_fs_struct); ++EXPORT_SYMBOL(unshare_fs_struct); +#endif EXPORT_SYMBOL(cfs_block_allsigs); EXPORT_SYMBOL(cfs_block_sigs);