[gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/

[Alexey Shvetsov]

commit:     a2e187caf28d7c04d07005496f8ecfaeaaefb5c2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 11:14:21 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 11:14:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a2e187ca

Update rebased patches

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

---
 sys-cluster/lustre/ChangeLog                       |   21 +++++
 ...d-make-AC-check-for-linux-arch-sandbox-f.patch} |   22 +++--
 ...fs-use-sock_alloc_file-instead-of-sock_m.patch} |    8 +-
 ...at-posix_acl_-to-from-_xattr-take-user_n.patch} |   10 +-
 ...04-LU-2800-llite-introduce-local-getname.patch} |    4 +-
 ...d-check-header-files-in-generated-uapi-d.patch} |   24 +++---
 ...0-kernel-3.8-upstream-removes-vmtruncate.patch} |    4 +-
 ...2850-kernel-3.8-upstream-kills-daemonize.patch} |   42 +++++-----
 ...rnel-3.9-hlist_for_each_entry-uses-3-args.patch |   87 --------------------
 ...tch => 0008-LU-2987-llite-rcu-free-inode.patch} |    4 +-
 sys-cluster/lustre/lustre-9999.ebuild              |   17 ++--
 11 files changed, 89 insertions(+), 154 deletions(-)

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index bce1420..16471dd 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -2,6 +2,27 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2013; Alexey Shvetsov <alexxy@g.o>
+  +files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  +files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch,
+  +files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch,
+  +files/0004-LU-2800-llite-introduce-local-getname.patch,
+  +files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch,
+  +files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch,
+  +files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch,
+  +files/0008-LU-2987-llite-rcu-free-inode.patch,
+  -files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  -files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch,
+  -files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch,
+  -files/0003-LU-2800-llite-introduce-local-getname.patch,
+  -files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.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,
+  -files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch,
+  lustre-9999.ebuild:
+  Update rebased patches
+
   27 Mar 2013; Alexey Shvetsov <alexxy@g.o>
   +files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch,
   +files/0003-LU-2800-llite-introduce-local-getname.patch,

diff --git a/sys-cluster/lustre/files/0000-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
similarity index 79%
rename from sys-cluster/lustre/files/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
rename to sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
index 1602cb0..3f372ac 100644
--- a/sys-cluster/lustre/files/0000-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,7 +1,8 @@
-From 1154d0914e29f3d6badb63913855faa008ac7b7b Mon Sep 17 00:00:00 2001
+From d0169772fa2ebda3ed5c619d5e5cd6339973b0a0 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@g.o>
 Date: Mon, 18 Mar 2013 16:22:27 +0400
-Subject: [PATCH] LU-2982 build: make AC check for linux arch sandbox friendly
+Subject: [PATCH 1/8] LU-2982 build: make AC check for linux arch sandbox
+ friendly
 
 this commit makes AC check for linux kernel arch sandbox friendly
 
@@ -9,14 +10,14 @@ Signed-off-by: Alexey Shvetsov <alexxy@g.o>
 Change-Id: I173cd892bca5587519806cf6d300a5053dfb935f
 Signed-off-by: Alexey Shvetsov <alexxy@g.o>
 ---
- build/autoconf/lustre-build-linux.m4 | 65 +++++++++++++++++++++++++++++++-----
- 1 file changed, 57 insertions(+), 8 deletions(-)
+ config/lustre-build-linux.m4 | 66 ++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 58 insertions(+), 8 deletions(-)
 
-diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
-index 4c0a581..9fcd0b3 100644
---- a/build/autoconf/lustre-build-linux.m4
-+++ b/build/autoconf/lustre-build-linux.m4
-@@ -363,14 +363,63 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
+diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
+index ec77262..244d398 100644
+--- a/config/lustre-build-linux.m4
++++ b/config/lustre-build-linux.m4
+@@ -325,14 +325,64 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
  # Determine the kernel's idea of the current architecture
  #
  AC_DEFUN([LB_LINUX_ARCH],
@@ -44,7 +45,8 @@ index 4c0a581..9fcd0b3 100644
 + #ifdef CONFIG_X86
 +  #ifdef CONFIG_X86_32
 +   #define UTS_MACHINE i386
-+  #else
++  #endif
++  #ifdef CONFIG_X86_64
 +   #define UTS_MACHINE x86_64
 +  #endif
 + #endif

diff --git a/sys-cluster/lustre/files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch b/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
similarity index 94%
rename from sys-cluster/lustre/files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
rename to sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
index d776d34..fe43064 100644
--- a/sys-cluster/lustre/files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
+++ b/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
@@ -1,7 +1,7 @@
-From b6d238eff4b7417cb5d5d9882b00c630b6ab2ee1 Mon Sep 17 00:00:00 2001
+From 8258deb14e38559bf5ef37bd50a0918cdf473c00 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 13 Feb 2013 02:45:16 -0500
-Subject: [PATCH 1/7] LU-2800 libcfs: use sock_alloc_file instead of
+Subject: [PATCH 2/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
@@ -19,7 +19,7 @@ Change-Id: I4e12da8c102b5d682db9658187330ae601b00a21
  2 files changed, 22 insertions(+), 13 deletions(-)
 
 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
-index e661f7d..977518a 100644
+index e661f7d..e84cd74 100644
 --- a/libcfs/autoconf/lustre-libcfs.m4
 +++ b/libcfs/autoconf/lustre-libcfs.m4
 @@ -500,18 +500,19 @@ LB_LINUX_TRY_COMPILE([
@@ -35,7 +35,7 @@ index e661f7d..977518a 100644
  	#include <linux/net.h>
  ],[
 -        sock_map_fd(NULL, 0);
-+	sock_alloc_file(NULL, 0);
++	sock_alloc_file(NULL, 0, NULL);
  ],[
 -        AC_MSG_RESULT(yes)
 -        AC_DEFINE(HAVE_SOCK_MAP_FD_2ARG, 1,

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/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
similarity index 95%
rename from sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
rename to sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
index de2178c..9f05db0 100644
--- a/sys-cluster/lustre/files/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
+++ b/sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
@@ -1,7 +1,7 @@
-From 66f494869c183a010a40397221e55c625e5d2e8b Mon Sep 17 00:00:00 2001
+From 3050d2c9cccb51ce521bdbecd471cb6ce18f77b8 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 20 Mar 2013 17:33:17 -0400
-Subject: [PATCH 2/7] LU-2850 compat: posix_acl_{to,from}_xattr take
+Subject: [PATCH 3/8] LU-2850 compat: posix_acl_{to,from}_xattr take
  user_namespace
 
 Commit 5f3a4a28 (v3.7) added a struct user_namespace argument to
@@ -121,7 +121,7 @@ index 14f3ef6..eb62458 100644
  int posix_acl_valid(const struct posix_acl *acl)
  {
 diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
-index 24a89eb..9575739 100644
+index f9e425d..7e3eb53 100644
 --- a/lustre/llite/xattr.c
 +++ b/lustre/llite/xattr.c
 @@ -345,7 +345,7 @@ int ll_getxattr_common(struct inode *inode, const char *name,
@@ -134,7 +134,7 @@ index 24a89eb..9575739 100644
                  RETURN(rc);
          }
 diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
-index fd087a5..d67db9d 100644
+index 9f3dea4..c9aa7a0 100644
 --- a/lustre/mdc/mdc_request.c
 +++ b/lustre/mdc/mdc_request.c
 @@ -41,6 +41,7 @@
@@ -145,7 +145,7 @@ index fd087a5..d67db9d 100644
  #else
  # include <liblustre.h>
  #endif
-@@ -466,7 +467,7 @@ static int mdc_unpack_acl(struct ptlrpc_request *req, struct lustre_md *md)
+@@ -465,7 +466,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/0003-LU-2800-llite-introduce-local-getname.patch b/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
similarity index 95%
rename from sys-cluster/lustre/files/0003-LU-2800-llite-introduce-local-getname.patch
rename to sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
index 18fd7cf..e194dfd 100644
--- a/sys-cluster/lustre/files/0003-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 f56dde4b75bf7cddf7c6da1ebdda3000b4f4c284 Mon Sep 17 00:00:00 2001
+From 4f1bc5cb857ebba89b84d27ed5ed6531b8a59058 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Tue, 19 Mar 2013 21:18:32 -0400
-Subject: [PATCH 3/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/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch b/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
similarity index 93%
rename from sys-cluster/lustre/files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch
rename to sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
index 83aca65..a802215 100644
--- a/sys-cluster/lustre/files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch
+++ b/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
@@ -1,7 +1,7 @@
-From 9960d414ad44b844306dd5aa82d4e8aabbb68261 Mon Sep 17 00:00:00 2001
+From 60c775330c663b7ecd32f314ab156ad0ba0ea072 Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Wed, 27 Feb 2013 18:29:34 +0800
-Subject: [PATCH 4/7] LU-2850 build: check header files in generated uapi dir
+Subject: [PATCH 5/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.
@@ -9,15 +9,15 @@ v3.7. We need to check/include necessary header files there.
 Signed-off-by: Peng Tao <tao.peng@×××.com>
 Change-Id: Ib104919189ebc0af7d3b5e9ca3b866b3b98be3dc
 ---
- autoMakefile.am                      |  2 +-
- build/autoconf/lustre-build-linux.m4 | 14 ++++++++------
- ldiskfs/config/ldiskfs-build.m4      | 14 ++++++++------
- lustre/autoconf/lustre-core.m4       |  2 +-
- lustre/scripts/version_tag.pl        |  1 +
+ autoMakefile.am                 |  2 +-
+ config/lustre-build-linux.m4    | 14 ++++++++------
+ ldiskfs/config/ldiskfs-build.m4 | 14 ++++++++------
+ lustre/autoconf/lustre-core.m4  |  2 +-
+ lustre/scripts/version_tag.pl   |  1 +
  5 files changed, 19 insertions(+), 14 deletions(-)
 
 diff --git a/autoMakefile.am b/autoMakefile.am
-index 8a259bc..6cc5f6d 100644
+index 79bcd65..93608de 100644
 --- a/autoMakefile.am
 +++ b/autoMakefile.am
 @@ -84,7 +84,7 @@ all-am: modules
@@ -29,10 +29,10 @@ index 8a259bc..6cc5f6d 100644
  	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
  	include/config/MARKER $@
  endif # LINUX
-diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
-index ec77262..5c7c227 100644
---- a/build/autoconf/lustre-build-linux.m4
-+++ b/build/autoconf/lustre-build-linux.m4
+diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
+index 244d398..b995875 100644
+--- a/config/lustre-build-linux.m4
++++ b/config/lustre-build-linux.m4
 @@ -44,7 +44,7 @@ AC_MSG_CHECKING([for Linux release])
  if test -s $LINUX_OBJ/include/$AUTOCONF_HDIR/utsrelease.h ; then
  	LINUXRELEASEHEADER=$AUTOCONF_HDIR/utsrelease.h

diff --git a/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
similarity index 93%
rename from sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
rename to sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
index 1222d02..380597d 100644
--- a/sys-cluster/lustre/files/0005-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
+++ b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
@@ -1,7 +1,7 @@
-From 043935d6e6e3ac7d988ef809cd7c16233fb8be65 Mon Sep 17 00:00:00 2001
+From 19491f9e67e43ae10ae1f71e38730606e2c518a8 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@g.o>
 Date: Wed, 27 Mar 2013 08:49:01 +0400
-Subject: [PATCH 5/7] LU-2850 kernel: 3.8 upstream removes vmtruncate()
+Subject: [PATCH 6/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/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
similarity index 98%
rename from sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
rename to sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
index 4f4e3ca..b6d2434 100644
--- a/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
+++ b/sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
@@ -1,7 +1,7 @@
-From 089c9fcca75da19ea13215925fc2cfb83d5dddb4 Mon Sep 17 00:00:00 2001
+From fc013881dd3b551e8fb8a5f6722a359c56c7bf63 Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Mon, 18 Mar 2013 10:47:57 +0800
-Subject: [PATCH 6/7] LU-2850 kernel: 3.8 upstream kills daemonize()
+Subject: [PATCH 7/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()
@@ -88,7 +88,7 @@ Change-Id: I9f977bfc5d58192957d8c8d634204f4910edfa2a
  delete mode 100644 libcfs/libcfs/linux/linux-lwt.c
 
 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
-index 977518a..8655c99 100644
+index e84cd74..5789166 100644
 --- a/libcfs/autoconf/lustre-libcfs.m4
 +++ b/libcfs/autoconf/lustre-libcfs.m4
 @@ -639,15 +639,6 @@ LB_LINUX_TRY_COMPILE([
@@ -2105,10 +2105,10 @@ index 4c58181..1d4e2e8 100644
          cfs_module_put(THIS_MODULE);
          return error;
 diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
-index 9eea49e..cb11191 100644
+index 6d5b7af..3211557 100644
 --- a/lustre/llite/statahead.c
 +++ b/lustre/llite/statahead.c
-@@ -998,12 +998,6 @@ static int ll_agl_thread(void *arg)
+@@ -981,12 +981,6 @@ static int ll_agl_thread(void *arg)
          struct l_wait_info        lwi    = { 0 };
          ENTRY;
  
@@ -2121,7 +2121,7 @@ index 9eea49e..cb11191 100644
          CDEBUG(D_READA, "agl thread started: [pid %d] [parent %.*s]\n",
                 cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
  
-@@ -1057,25 +1051,28 @@ static int ll_agl_thread(void *arg)
+@@ -1040,25 +1034,28 @@ static int ll_agl_thread(void *arg)
  
  static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
  {
@@ -2166,7 +2166,7 @@ index 9eea49e..cb11191 100644
  }
  
  static int ll_statahead_thread(void *arg)
-@@ -1096,12 +1093,6 @@ static int ll_statahead_thread(void *arg)
+@@ -1079,12 +1076,6 @@ static int ll_statahead_thread(void *arg)
          struct l_wait_info        lwi    = { 0 };
          ENTRY;
  
@@ -2179,7 +2179,7 @@ index 9eea49e..cb11191 100644
          CDEBUG(D_READA, "statahead thread started: [pid %d] [parent %.*s]\n",
                 cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
  
-@@ -1565,6 +1556,7 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
+@@ -1548,6 +1539,7 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
          struct ptlrpc_thread     *thread;
          struct l_wait_info        lwi   = { 0 };
          int                       rc    = 0;
@@ -2187,7 +2187,7 @@ index 9eea49e..cb11191 100644
          ENTRY;
  
          LASSERT(lli->lli_opendir_pid == cfs_curproc_pid());
-@@ -1709,11 +1701,14 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
+@@ -1693,11 +1685,14 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
                 cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
  
          lli->lli_sai = sai;
@@ -2208,10 +2208,10 @@ index 9eea49e..cb11191 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 d67db9d..cf4c46c 100644
+index c9aa7a0..ead4bcf 100644
 --- a/lustre/mdc/mdc_request.c
 +++ b/lustre/mdc/mdc_request.c
-@@ -1567,13 +1567,6 @@ static int mdc_changelog_send_thread(void *csdata)
+@@ -1566,13 +1566,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);
  
@@ -2225,7 +2225,7 @@ index d67db9d..cf4c46c 100644
          OBD_ALLOC(cs->cs_buf, CR_MAXSIZE);
          if (cs->cs_buf == NULL)
                  GOTO(out, rc = -ENOMEM);
-@@ -1610,12 +1603,10 @@ out:
+@@ -1609,12 +1602,10 @@ out:
  		llog_cat_close(NULL, llh);
          if (ctxt)
                  llog_ctxt_put(ctxt);
@@ -2242,7 +2242,7 @@ index d67db9d..cf4c46c 100644
  }
  
  static int mdc_ioc_changelog_send(struct obd_device *obd,
-@@ -1635,13 +1626,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
+@@ -1634,13 +1625,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
  	cs->cs_fp = fget(icc->icc_id);
  	cs->cs_flags = icc->icc_flags;
  
@@ -2506,7 +2506,7 @@ index f08fd6e..ce22932 100644
  			       loghandle->lgh_ctxt->loc_obd->obd_name, rc);
  			OBD_FREE_PTR(lpi);
 diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
-index 3736410..8d53834 100644
+index 1e27918..f122d38 100644
 --- a/lustre/osd-ldiskfs/osd_scrub.c
 +++ b/lustre/osd-ldiskfs/osd_scrub.c
 @@ -962,7 +962,6 @@ static int osd_scrub_main(void *args)
@@ -2529,7 +2529,7 @@ index 3736410..8d53834 100644
  		       LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, rc);
  		RETURN(rc);
 diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c
-index 1836f18..af52b9e 100644
+index 9b3febc..51c2c94 100644
 --- a/lustre/osp/osp_precreate.c
 +++ b/lustre/osp/osp_precreate.c
 @@ -881,15 +881,11 @@ static int osp_precreate_thread(void *_arg)
@@ -2548,7 +2548,7 @@ index 1836f18..af52b9e 100644
  	rc = lu_env_init(&env, d->opd_dt_dev.dd_lu_dev.ld_type->ldt_ctx_tags);
  	if (rc) {
  		CERROR("%s: init env error: rc = %d\n", d->opd_obd->obd_name,
-@@ -1258,7 +1254,7 @@ out:
+@@ -1260,7 +1256,7 @@ out:
  int osp_init_precreate(struct osp_device *d)
  {
  	struct l_wait_info	 lwi = { 0 };
@@ -2557,7 +2557,7 @@ index 1836f18..af52b9e 100644
  
  	ENTRY;
  
-@@ -1293,10 +1289,11 @@ int osp_init_precreate(struct osp_device *d)
+@@ -1295,10 +1291,11 @@ int osp_init_precreate(struct osp_device *d)
  	/*
  	 * start thread handling precreation and statfs updates
  	 */
@@ -2574,10 +2574,10 @@ index 1836f18..af52b9e 100644
  
  	l_wait_event(d->opd_pre_thread.t_ctl_waitq,
 diff --git a/lustre/osp/osp_sync.c b/lustre/osp/osp_sync.c
-index 219744f..67863a2 100644
+index dfa263e..fddd9b6 100644
 --- a/lustre/osp/osp_sync.c
 +++ b/lustre/osp/osp_sync.c
-@@ -838,7 +838,6 @@ static int osp_sync_thread(void *_arg)
+@@ -827,7 +827,6 @@ static int osp_sync_thread(void *_arg)
  	struct llog_handle	*llh;
  	struct lu_env		 env;
  	int			 rc, count;
@@ -2585,7 +2585,7 @@ index 219744f..67863a2 100644
  
  	ENTRY;
  
-@@ -849,9 +848,6 @@ static int osp_sync_thread(void *_arg)
+@@ -838,9 +837,6 @@ static int osp_sync_thread(void *_arg)
  		RETURN(rc);
  	}
  
@@ -2595,7 +2595,7 @@ index 219744f..67863a2 100644
  	spin_lock(&d->opd_syn_lock);
  	thread->t_flags = SVC_RUNNING;
  	spin_unlock(&d->opd_syn_lock);
-@@ -1055,8 +1051,9 @@ int osp_sync_init(const struct lu_env *env, struct osp_device *d)
+@@ -1044,8 +1040,9 @@ int osp_sync_init(const struct lu_env *env, struct osp_device *d)
  	cfs_waitq_init(&d->opd_syn_thread.t_ctl_waitq);
  	CFS_INIT_LIST_HEAD(&d->opd_syn_committed_there);
  

diff --git a/sys-cluster/lustre/files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch b/sys-cluster/lustre/files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
deleted file mode 100644
index 3f63488..0000000
--- a/sys-cluster/lustre/files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c0de4e9ce93a4c803c17c0ff6dffdebf3fd407b1 Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@g.o>
-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 <sasha.levin@××××××.com>
-Date:   Wed Feb 27 17:06:00 2013 -0800
-
-    hlist: drop the node parameter from iterators
-
-Signed-off-by: Alexey Shvetsov <alexxy@g.o>
-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 <linux/list.h>
-+	#include <linux/fs.h>
-+],[
-+	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/files/0007-LU-2987-llite-rcu-free-inode.patch b/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
similarity index 95%
rename from sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch
rename to sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
index 0055d26..35d281d 100644
--- a/sys-cluster/lustre/files/0007-LU-2987-llite-rcu-free-inode.patch
+++ b/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
@@ -1,7 +1,7 @@
-From c38a8fce9d43a0b188360d504adc3cac7ae775c4 Mon Sep 17 00:00:00 2001
+From 77ae599340fc509002f2875257c2e024fb1b44fb Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Tue, 19 Mar 2013 14:04:47 +0800
-Subject: [PATCH 7/7] LU-2987 llite: rcu-free inode
+Subject: [PATCH 8/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/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index 48ce0cf..0b27062 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -30,15 +30,14 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch"
-	"${FILESDIR}/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch"
-	"${FILESDIR}/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch"
-	"${FILESDIR}/0003-LU-2800-llite-introduce-local-getname.patch"
-	"${FILESDIR}/0004-LU-2850-build-check-header-files-in-generated-uapi-d.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-2987-llite-rcu-free-inode.patch"
-	"${FILESDIR}/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch"
+	"${FILESDIR}/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch"
+	"${FILESDIR}/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch"
+	"${FILESDIR}/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch"
+	"${FILESDIR}/0004-LU-2800-llite-introduce-local-getname.patch"
+	"${FILESDIR}/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch"
+	"${FILESDIR}/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch"
+	"${FILESDIR}/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch"
+	"${FILESDIR}/0008-LU-2987-llite-rcu-free-inode.patch"
 )
 
 pkg_setup() {