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 7424B198005 for ; Fri, 22 Mar 2013 11:08:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C56AEE0262; Fri, 22 Mar 2013 11:08:15 +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 1D1FAE0586 for ; Fri, 22 Mar 2013 11:08:15 +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 E9A3333D3D3 for ; Fri, 22 Mar 2013 11:08:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5BF0AE4073 for ; Fri, 22 Mar 2013 11:08:12 +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: <1363950449.fb3f7922d5fb5435ac67de669ee5a42792327c71.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-compat-posix_acl_-to-from-_xattr-take-user_n.patch sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.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 sys-cluster/lustre/files/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch sys-cluster/lustre/files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch sys-cluster/lustre/files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch sys-cluster/lustre/lustre-9999.ebuild X-VCS-Directories: sys-cluster/lustre/ sys-cluster/lustre/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: fb3f7922d5fb5435ac67de669ee5a42792327c71 X-VCS-Branch: master Date: Fri, 22 Mar 2013 11:08:12 +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: e2a12e80-0252-4fbd-8185-5babfea4853e X-Archives-Hash: a3fc719c83a3321181842b87d90cfa13 commit: fb3f7922d5fb5435ac67de669ee5a42792327c71 Author: Alexey Shvetsov gentoo org> AuthorDate: Fri Mar 22 11:07:29 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Fri Mar 22 11:07:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb3f7922 Update patches for 3.9 Package-Manager: portage-2.2.0_alpha169 RepoMan-Options: --force --- sys-cluster/lustre/ChangeLog | 13 +++ ...ld-check-header-files-in-generated-uapi-d.patch | 2 +- ...pat-posix_acl_-to-from-_xattr-take-user_n.patch | 2 +- ...cfs-use-sock_alloc_file-instead-of-sock_m.patch | 2 +- ...004-LU-2800-llite-introduce-local-getname.patch | 2 +- ...50-kernel-3.8-upstream-removes-vmtruncate.patch | 2 +- ...-2850-kernel-3.8-upstream-kills-daemonize.patch | 2 +- ...ld-Fix-warning-with-gcc-4.6-in-mdt_handle.patch | 38 --------- .../files/0007-LU-2987-llite-rcu-free-inode.patch | 2 +- ...ld-fix-unused-uninitilized-virables-error.patch | 30 +++++++ ...rnel-3.9-hlist_for_each_entry-uses-3-args.patch | 87 ++++++++++++++++++++ sys-cluster/lustre/lustre-9999.ebuild | 3 +- 12 files changed, 139 insertions(+), 46 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index 0db92f6..2853d73 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -3,6 +3,19 @@ # $Header: $ 22 Mar 2013; Alexey Shvetsov + +files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch, + +files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch, + -files/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch, + files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch, + files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch, + files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch, + files/0004-LU-2800-llite-introduce-local-getname.patch, + files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch, + files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch, + files/0007-LU-2987-llite-rcu-free-inode.patch, lustre-9999.ebuild: + Update patches for 3.9 + + 22 Mar 2013; Alexey Shvetsov +files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch, +files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch, +files/0004-LU-2800-llite-introduce-local-getname.patch, 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 e564b12..508cebf 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,7 +1,7 @@ From b97f4190c2347410737c5b6698773c17f714f5ec Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 27 Feb 2013 18:29:34 +0800 -Subject: [PATCH 1/7] LU-2850 build: check header files in generated uapi dir +Subject: [PATCH 1/8] LU-2850 build: check header files in generated uapi dir Upstream moved UAPI headers into generated/uapi directory since v3.7. We need to check/include necessary header files there. diff --git a/sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch b/sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch index 21f427e..23969a6 100644 --- a/sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch +++ b/sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch @@ -1,7 +1,7 @@ From 8153aab75bd9d96af36df0d8eafbe6b3eac45e1c Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 20 Mar 2013 17:33:17 -0400 -Subject: [PATCH 2/7] LU-2850 compat: posix_acl_{to,from}_xattr take +Subject: [PATCH 2/8] LU-2850 compat: posix_acl_{to,from}_xattr take user_namespace Commit 5f3a4a28 (v3.7) added a struct user_namespace argument to diff --git a/sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch b/sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch index bb5d987..bc345f5 100644 --- a/sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch +++ b/sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch @@ -1,7 +1,7 @@ From 92aab7a02e1de86cadc46edc81cc9627d3c0887a Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 13 Feb 2013 02:45:16 -0500 -Subject: [PATCH 3/7] LU-2800 libcfs: use sock_alloc_file instead of +Subject: [PATCH 3/8] LU-2800 libcfs: use sock_alloc_file instead of sock_map_fd v2.6.27 added a second argument to sock_map_fd. Earlier versions are diff --git a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch b/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch index 6f84fec..c8e0015 100644 --- a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch +++ b/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch @@ -1,7 +1,7 @@ From b0dfb2b6916017d659cae52a28f5a86341b4c97f Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Tue, 19 Mar 2013 21:18:32 -0400 -Subject: [PATCH 4/7] LU-2800 llite: introduce local getname() +Subject: [PATCH 4/8] LU-2800 llite: introduce local getname() Commit 8e377d15 (v3.7) unexported getname and putname. Although getname was re-exported, putname was not. All we really need is 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 418e081..7be9486 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,7 +1,7 @@ From 6ef5ad16aba6cd3ddaf5e27e9b709a38c3ea3c2b Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 26 Feb 2013 18:09:42 +0800 -Subject: [PATCH 5/7] LU-2850 kernel: 3.8 upstream removes vmtruncate() +Subject: [PATCH 5/8] LU-2850 kernel: 3.8 upstream removes vmtruncate() vmtruncate() is removed since upstream commit b9f61c3. We can open code is for llite though. 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 0c976e1..7ff6418 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,7 +1,7 @@ From 728e7f60624f777c2629cda04305eeaea9a59d04 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Mon, 18 Mar 2013 10:47:57 +0800 -Subject: [PATCH 6/7] LU-2850 kernel: 3.8 upstream kills daemonize() +Subject: [PATCH 6/8] LU-2850 kernel: 3.8 upstream kills daemonize() kernel_thread() is a low level kernel function. Instead of calling kernel_thread() and relying on daemonize() diff --git a/sys-cluster/lustre/files/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch b/sys-cluster/lustre/files/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch deleted file mode 100644 index f578c62..0000000 --- a/sys-cluster/lustre/files/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c839b9bbd3fca53d8f5a530d1a2285419cf3071 Mon Sep 17 00:00:00 2001 -From: Alexey Shvetsov -Date: Tue, 19 Mar 2013 00:48:48 +0400 -Subject: [PATCH] LU-2984 build: Fix warning with gcc-4.6+ in mdt_handler.c -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc-4.6+ has more stricter check for possible usage of unnitialized -variables so it will generate error with -Werror like this - -lustre/mdt/mdt_handler.c: In function ‘mdt_get_info’: -lustre/mdt/mdt_handler.c:5508:9: error: ‘rc’ may be used uninitialized -in this function [-Werror=maybe-uninitialized] -cc1: all warnings being treated as errors - -Signed-off-by: Alexey Shvetsov -Change-Id: Ia330808886b466c4a7d184add56b1ede115c7d0e ---- - lustre/mdt/mdt_handler.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c -index 02dcdb8..38b59a6 100644 ---- a/lustre/mdt/mdt_handler.c -+++ b/lustre/mdt/mdt_handler.c -@@ -5505,7 +5505,7 @@ static int mdt_fid2path(const struct lu_env *env, struct mdt_device *mdt, - { - struct mdt_object *obj; - struct obd_device *obd = mdt2obd_dev(mdt); -- int rc; -+ int rc = 0; - ENTRY; - - CDEBUG(D_IOCTL, "path get "DFID" from "LPU64" #%d\n", --- -1.8.1.5 - 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 a819726..de4c649 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,7 +1,7 @@ From acba951ab52918a0b5d247e9dac561f8ae70aa18 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 19 Mar 2013 14:04:47 +0800 -Subject: [PATCH 7/7] LU-2987 llite: rcu-free inode +Subject: [PATCH 7/8] LU-2987 llite: rcu-free inode Since 2.6.38, inode.i_rcu was added and file system .destory_inode should rcu-free inodes. diff --git a/sys-cluster/lustre/files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch b/sys-cluster/lustre/files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch new file mode 100644 index 0000000..04603cf --- /dev/null +++ b/sys-cluster/lustre/files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch @@ -0,0 +1,30 @@ +From f18c8e7cd37a4208fd5c96e149d78c7249edb7e2 Mon Sep 17 00:00:00 2001 +From: James Simmons +Date: Tue, 12 Mar 2013 14:32:19 -0400 +Subject: [PATCH 8/8] LU-2929 build: fix unused/uninitilized virables error + +As reported by gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2). + +Signed-off-by: Peng Tao +Signed-off-by: James Simmons +Change-Id: I05aeb88dbd00b6b005ddde543a527339a9d66ce0 +--- + lustre/mdt/mdt_handler.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c +index c5293ec..f7ed271 100644 +--- a/lustre/mdt/mdt_handler.c ++++ b/lustre/mdt/mdt_handler.c +@@ -5703,6 +5703,8 @@ static int mdt_fid2path(struct mdt_thread_info *info, + rc = -EREMOTE; + else if (!mdt_object_exists(obj)) + rc = -ENOENT; ++ else ++ rc = 0; + + if (rc < 0) { + mdt_object_put(info->mti_env, obj); +-- +1.8.1.5 + diff --git a/sys-cluster/lustre/files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch b/sys-cluster/lustre/files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch new file mode 100644 index 0000000..3f63488 --- /dev/null +++ b/sys-cluster/lustre/files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch @@ -0,0 +1,87 @@ +From c0de4e9ce93a4c803c17c0ff6dffdebf3fd407b1 Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov +Date: Fri, 22 Mar 2013 14:36:15 +0400 +Subject: [PATCH] LU-2850 kernel: 3.9 hlist_for_each_entry uses 3 args + +In 3.9 hlist_for_each_entry use 3 args since commit + +commit b67bfe0d42cac56c512dd5da4b1b347a23f4b70a +Author: Sasha Levin +Date: Wed Feb 27 17:06:00 2013 -0800 + + hlist: drop the node parameter from iterators + +Signed-off-by: Alexey Shvetsov +Change-Id: I8f38d562607de21771b03575e37cc0498867a570 +--- + lustre/autoconf/lustre-core.m4 | 28 ++++++++++++++++++++++++++++ + lustre/include/linux/lustre_compat25.h | 5 +++++ + 2 files changed, 33 insertions(+) + +diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 +index 78dbe99..b8b8ae7 100644 +--- a/lustre/autoconf/lustre-core.m4 ++++ b/lustre/autoconf/lustre-core.m4 +@@ -2272,6 +2272,31 @@ LB_LINUX_TRY_COMPILE([ + + + # ++# 3.9 uses hlist_for_each_entry with 3 args ++# b67bfe0d42cac56c512dd5da4b1b347a23f4b70a ++# ++AC_DEFUN([LC_HAVE_HLIST_FOR_EACH_3ARG], ++[AC_MSG_CHECKING([if hlist_for_each_entry has 3 args]) ++tmp_flags="$EXTRA_KCFLAGS" ++EXTRA_KCFLAGS="-Werror" ++LB_LINUX_TRY_COMPILE([ ++ #include ++ #include ++],[ ++ struct inode *inode; ++ struct dentry *dentry; ++ hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) { ++ continue; ++ } ++],[ ++ AC_DEFINE(HAVE_HLIST_FOR_EACH_3ARG, 1, [3 args]) ++ AC_MSG_RESULT([yes]) ++],[ ++ AC_MSG_RESULT([no]) ++]) ++]) ++ ++# + # LC_PROG_LINUX + # + # Lustre linux kernel checks +@@ -2457,6 +2482,9 @@ AC_DEFUN([LC_PROG_LINUX], + # 3.8 + LC_HAVE_MM_VMTRUNCATE + ++ # 3.9 ++ LC_HAVE_HLIST_FOR_EACH_3ARG ++ + # + if test x$enable_server = xyes ; then + AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) +diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h +index d25c168..06a3a50 100644 +--- a/lustre/include/linux/lustre_compat25.h ++++ b/lustre/include/linux/lustre_compat25.h +@@ -611,8 +611,13 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) + #define ll_d_hlist_empty(list) hlist_empty(list) + #define ll_d_hlist_entry(ptr, type, name) hlist_entry(ptr.first, type, name) + #define ll_d_hlist_for_each(tmp, i_dentry) hlist_for_each(tmp, i_dentry) ++#ifdef HAVE_HLIST_FOR_EACH_3ARG ++#define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \ ++ p = NULL; hlist_for_each_entry(dentry, i_dentry, alias) ++#else + #define ll_d_hlist_for_each_entry(dentry, p, i_dentry, alias) \ + hlist_for_each_entry(dentry, p, i_dentry, alias) ++#endif + #else + #define ll_d_hlist_node list_head + #define ll_d_hlist_empty(list) list_empty(list) +-- +1.8.1.5 + diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild index 417f6ff..9a93eff 100644 --- a/sys-cluster/lustre/lustre-9999.ebuild +++ b/sys-cluster/lustre/lustre-9999.ebuild @@ -37,8 +37,9 @@ PATCHES=( "${FILESDIR}/0004-LU-2800-llite-introduce-local-getname.patch" "${FILESDIR}/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch" "${FILESDIR}/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch" - "${FILESDIR}/0007-LU-2984-build-Fix-warning-with-gcc-4.6-in-mdt_handle.patch" "${FILESDIR}/0007-LU-2987-llite-rcu-free-inode.patch" + "${FILESDIR}/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch" + "${FILESDIR}/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch" ) pkg_setup() {