Now it builds and loads with 3.8

Package-Manager: portage-2.2.0_alpha166
RepoMan-Options: --force

7 files changed, 50 insertions, 28 deletions

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index e887ab6c9..a7ad425b1 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -3,6 +3,15 @@
 # $Header: $
 
   14 Mar 2013; Alexey Shvetsov <alexxy@gentoo.org>
+  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 <alexxy@gentoo.org>
   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 066863bcb..774f3280b 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 <tao.peng@emc.com>
 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 19f39db66..d9c8e641b 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 <tao.peng@emc.com>
 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 <tao.peng@emc.com>
 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 <linux/posix_acl_xattr.h>
+         #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 9cae25b15..a50e44314 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 <tao.peng@emc.com>
 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 df891bee9..56ad53b87 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 <tao.peng@emc.com>
 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 <tao.peng@emc.com>
 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 c3e66fccf..3d4ad6d50 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 <tao.peng@emc.com>
 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 cae20180e..8b990df77 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 <tao.peng@emc.com>
 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);