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

[Alexey Shvetsov]

commit:     ce672f91105a825bb21304934c8e50d1052305ba
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 05:05:33 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 05:05:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ce672f91

Update patches

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

---
 sys-cluster/lustre/ChangeLog                       |   16 ++++
 ...fs-use-sock_alloc_file-instead-of-sock_m.patch} |    4 +-
 ...pat-posix_acl_-to-from-_xattr-take-user_n.patch |   12 ++--
 ...03-LU-2800-llite-introduce-local-getname.patch} |    6 +-
 ...d-check-header-files-in-generated-uapi-d.patch} |   10 +-
 ...50-kernel-3.8-upstream-removes-vmtruncate.patch |   30 +++----
 ...-2850-kernel-3.8-upstream-kills-daemonize.patch |   93 +++-----------------
 .../files/0007-LU-2987-llite-rcu-free-inode.patch  |    8 +-
 ...nel-3.9-hlist_for_each_entry-uses-3-args.patch} |    0
 ...ld-fix-unused-uninitilized-virables-error.patch |   30 ------
 sys-cluster/lustre/lustre-9999.ebuild              |    9 +-
 11 files changed, 65 insertions(+), 153 deletions(-)

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 2853d73..bce1420 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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,
+  +files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch,
+  +files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch,
+  -files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.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/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/0002-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.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
+
   22 Mar 2013; Alexey Shvetsov <alexxy@g.o>
   +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,

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/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
similarity index 96%
rename from sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
rename to sys-cluster/lustre/files/0001-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
index bc345f5..d776d34 100644
--- a/sys-cluster/lustre/files/0003-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
+++ b/sys-cluster/lustre/files/0001-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 b6d238eff4b7417cb5d5d9882b00c630b6ab2ee1 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 13 Feb 2013 02:45:16 -0500
-Subject: [PATCH 3/8] LU-2800 libcfs: use sock_alloc_file instead of
+Subject: [PATCH 1/7] 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/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 23969a6..de2178c 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 66f494869c183a010a40397221e55c625e5d2e8b Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 20 Mar 2013 17:33:17 -0400
-Subject: [PATCH 2/8] LU-2850 compat: posix_acl_{to,from}_xattr take
+Subject: [PATCH 2/7] LU-2850 compat: posix_acl_{to,from}_xattr take
  user_namespace
 
 Commit 5f3a4a28 (v3.7) added a struct user_namespace argument to
@@ -67,10 +67,10 @@ index 53975ab..fa4e4d4 100644
 +#endif
  #endif
 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index 3c773e8..fee7abc 100644
+index 601155c..125bde7 100644
 --- a/lustre/autoconf/lustre-core.m4
 +++ b/lustre/autoconf/lustre-core.m4
-@@ -2213,6 +2213,25 @@ LB_LINUX_TRY_COMPILE([
+@@ -2233,6 +2233,25 @@ LB_LINUX_TRY_COMPILE([
  ])
  
  #
@@ -96,7 +96,7 @@ index 3c773e8..fee7abc 100644
  # LC_PROG_LINUX
  #
  # Lustre linux kernel checks
-@@ -2391,6 +2410,8 @@ AC_DEFUN([LC_PROG_LINUX],
+@@ -2414,6 +2433,8 @@ AC_DEFUN([LC_PROG_LINUX],
  	 LC_DENTRY_OPEN_USE_PATH
  	 LC_HAVE_IOP_ATOMIC_OPEN
  
@@ -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 9fc8e51..a7b6d4a 100644
+index fd087a5..d67db9d 100644
 --- a/lustre/mdc/mdc_request.c
 +++ b/lustre/mdc/mdc_request.c
 @@ -41,6 +41,7 @@

diff --git a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch b/sys-cluster/lustre/files/0003-LU-2800-llite-introduce-local-getname.patch
similarity index 94%
rename from sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
rename to sys-cluster/lustre/files/0003-LU-2800-llite-introduce-local-getname.patch
index c8e0015..18fd7cf 100644
--- a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
+++ b/sys-cluster/lustre/files/0003-LU-2800-llite-introduce-local-getname.patch
@@ -1,7 +1,7 @@
-From b0dfb2b6916017d659cae52a28f5a86341b4c97f Mon Sep 17 00:00:00 2001
+From f56dde4b75bf7cddf7c6da1ebdda3000b4f4c284 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Tue, 19 Mar 2013 21:18:32 -0400
-Subject: [PATCH 4/8] LU-2800 llite: introduce local getname()
+Subject: [PATCH 3/7] 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
@@ -16,7 +16,7 @@ Change-Id: If44cd9f9d14f26f220d5f0c52e8b804a49d3cf92
  1 file changed, 28 insertions(+), 4 deletions(-)
 
 diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
-index a3a514c..3983ef0 100644
+index 493996d..14ea720 100644
 --- a/lustre/llite/dir.c
 +++ b/lustre/llite/dir.c
 @@ -1227,6 +1227,30 @@ out:

diff --git a/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch b/sys-cluster/lustre/files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch
similarity index 97%
rename from sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch
rename to sys-cluster/lustre/files/0004-LU-2850-build-check-header-files-in-generated-uapi-d.patch
index 508cebf..83aca65 100644
--- a/sys-cluster/lustre/files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch
+++ b/sys-cluster/lustre/files/0004-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 9960d414ad44b844306dd5aa82d4e8aabbb68261 Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Wed, 27 Feb 2013 18:29:34 +0800
-Subject: [PATCH 1/8] LU-2850 build: check header files in generated uapi dir
+Subject: [PATCH 4/7] 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.
@@ -30,7 +30,7 @@ index 8a259bc..6cc5f6d 100644
  	include/config/MARKER $@
  endif # LINUX
 diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
-index 4c0a581..0873c05 100644
+index ec77262..5c7c227 100644
 --- a/build/autoconf/lustre-build-linux.m4
 +++ b/build/autoconf/lustre-build-linux.m4
 @@ -44,7 +44,7 @@ AC_MSG_CHECKING([for Linux release])
@@ -73,7 +73,7 @@ index 4c0a581..0873c05 100644
  	# This is a clean kernel-source tree, we need to
  	# enable extensive workarounds to get this to build
  	# modules
-@@ -350,7 +352,7 @@ $2
+@@ -312,7 +314,7 @@ $2
  AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
  [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
  rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
@@ -132,7 +132,7 @@ index fd0f6d2..d657399 100644
  	# enable extensive workarounds to get this to build
  	# modules
 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index 08f5e29..3c773e8 100644
+index 125bde7..5b82ff8 100644
 --- a/lustre/autoconf/lustre-core.m4
 +++ b/lustre/autoconf/lustre-core.m4
 @@ -319,7 +319,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H],

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 7be9486..1222d02 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,24 +1,23 @@
-From 6ef5ad16aba6cd3ddaf5e27e9b709a38c3ea3c2b Mon Sep 17 00:00:00 2001
-From: Peng Tao <tao.peng@×××.com>
-Date: Tue, 26 Feb 2013 18:09:42 +0800
-Subject: [PATCH 5/8] LU-2850 kernel: 3.8 upstream removes vmtruncate()
+From 043935d6e6e3ac7d988ef809cd7c16233fb8be65 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()
 
 vmtruncate() is removed since upstream commit b9f61c3.
 We can open code is for llite though.
 
 Signed-off-by: Peng Tao <tao.peng@×××.com>
 Change-Id: I9d4f43a5c181f16482b4caa021ba7a09ee52b600
-Signed-off-by: Alexey Shvetsov <alexxy@g.o>
 ---
- lustre/autoconf/lustre-core.m4 | 24 ++++++++++++++++++++++++
- lustre/llite/vvp_io.c          | 10 +++++++++-
- 2 files changed, 33 insertions(+), 1 deletion(-)
+ lustre/autoconf/lustre-core.m4 | 23 +++++++++++++++++++++++
+ lustre/llite/vvp_io.c          |  9 +++++++++
+ 2 files changed, 32 insertions(+)
 
 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index fee7abc..3e4bfdc 100644
+index 5b82ff8..d736343 100644
 --- a/lustre/autoconf/lustre-core.m4
 +++ b/lustre/autoconf/lustre-core.m4
-@@ -2232,6 +2232,26 @@ LB_LINUX_TRY_COMPILE([
+@@ -2252,6 +2252,25 @@ LB_LINUX_TRY_COMPILE([
  ])
  
  #
@@ -40,12 +39,11 @@ index fee7abc..3e4bfdc 100644
 +])
 +])
 +
-+
 +#
  # LC_PROG_LINUX
  #
  # Lustre linux kernel checks
-@@ -2412,6 +2432,10 @@ AC_DEFUN([LC_PROG_LINUX],
+@@ -2435,6 +2454,10 @@ AC_DEFUN([LC_PROG_LINUX],
  
  	 # 3.7
   	 LC_HAVE_POSIXACL_USER_NS
@@ -57,10 +55,10 @@ index fee7abc..3e4bfdc 100644
  	 if test x$enable_server = xyes ; then
  		AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
 diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
-index db53842..aef8e4b 100644
+index db53842..c261429 100644
 --- a/lustre/llite/vvp_io.c
 +++ b/lustre/llite/vvp_io.c
-@@ -362,9 +362,17 @@ static int vvp_do_vmtruncate(struct inode *inode, size_t size)
+@@ -362,7 +362,16 @@ static int vvp_do_vmtruncate(struct inode *inode, size_t size)
  	 * Only ll_inode_size_lock is taken at this level.
  	 */
  	ll_inode_size_lock(inode);
@@ -75,10 +73,8 @@ index db53842..aef8e4b 100644
 +	truncate_setsize(inode, size);
 +#endif
  	ll_inode_size_unlock(inode);
--
- 	return result;
- }
  
+ 	return result;
 -- 
 1.8.1.5
 

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 7ff6418..4f4e3ca 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,14 +1,19 @@
-From 728e7f60624f777c2629cda04305eeaea9a59d04 Mon Sep 17 00:00:00 2001
+From 089c9fcca75da19ea13215925fc2cfb83d5dddb4 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/8] LU-2850 kernel: 3.8 upstream kills daemonize()
+Subject: [PATCH 6/7] 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()
 to create new kernel threads, we should really switch to
 kthread_run() and elimilate daemonize().
 
+Conflicts:
+	lustre/obdclass/llog_cat.c
+	lustre/ptlrpc/recov_thread.c
+
 Signed-off-by: Peng Tao <tao.peng@×××.com>
+Signed-off-by: Alexey Shvetsov <alexxy@g.o>
 Change-Id: I9f977bfc5d58192957d8c8d634204f4910edfa2a
 ---
  libcfs/autoconf/lustre-libcfs.m4           | 28 -----------
@@ -68,20 +73,18 @@ Change-Id: I9f977bfc5d58192957d8c8d634204f4910edfa2a
  lustre/mgs/mgs_nids.c                      | 13 ++---
  lustre/obdclass/genops.c                   | 22 +++-----
  lustre/obdclass/llog.c                     |  8 +--
- lustre/obdclass/llog_cat.c                 |  2 +-
  lustre/osd-ldiskfs/osd_scrub.c             |  5 +-
  lustre/osp/osp_precreate.c                 | 15 +++---
  lustre/osp/osp_sync.c                      |  9 ++--
  lustre/ptlrpc/import.c                     | 34 +++++++------
  lustre/ptlrpc/pinger.c                     | 39 +++++++-------
  lustre/ptlrpc/ptlrpcd.c                    | 25 +++++----
- lustre/ptlrpc/recov_thread.c               | 40 ++++++++-------
  lustre/ptlrpc/sec_gc.c                     | 12 ++---
  lustre/ptlrpc/service.c                    | 19 ++++---
  lustre/quota/qmt_lock.c                    | 17 +++----
  lustre/quota/qsd_reint.c                   |  6 +--
  lustre/quota/qsd_writeback.c               | 16 +++---
- 70 files changed, 536 insertions(+), 773 deletions(-)
+ 68 files changed, 514 insertions(+), 753 deletions(-)
  delete mode 100644 libcfs/libcfs/linux/linux-lwt.c
 
 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
@@ -2205,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 a7b6d4a..7960645 100644
+index d67db9d..cf4c46c 100644
 --- a/lustre/mdc/mdc_request.c
 +++ b/lustre/mdc/mdc_request.c
-@@ -1553,13 +1553,6 @@ static int mdc_changelog_send_thread(void *csdata)
+@@ -1567,13 +1567,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);
  
@@ -2222,7 +2225,7 @@ index a7b6d4a..7960645 100644
          OBD_ALLOC(cs->cs_buf, CR_MAXSIZE);
          if (cs->cs_buf == NULL)
                  GOTO(out, rc = -ENOMEM);
-@@ -1596,12 +1589,10 @@ out:
+@@ -1610,12 +1603,10 @@ out:
  		llog_cat_close(NULL, llh);
          if (ctxt)
                  llog_ctxt_put(ctxt);
@@ -2239,7 +2242,7 @@ index a7b6d4a..7960645 100644
  }
  
  static int mdc_ioc_changelog_send(struct obd_device *obd,
-@@ -1621,13 +1612,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
+@@ -1635,13 +1626,16 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
  	cs->cs_fp = fget(icc->icc_id);
  	cs->cs_flags = icc->icc_flags;
  
@@ -2502,19 +2505,6 @@ index f08fd6e..ce22932 100644
  			CERROR("%s: cannot start thread: rc = %d\n",
  			       loghandle->lgh_ctxt->loc_obd->obd_name, rc);
  			OBD_FREE_PTR(lpi);
-diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c
-index fbf2766..7945237 100644
---- a/lustre/obdclass/llog_cat.c
-+++ b/lustre/obdclass/llog_cat.c
-@@ -647,7 +647,7 @@ int llog_cat_process_thread(void *data)
-         int rc;
-         ENTRY;
- 
--        cfs_daemonize_ctxt("ll_log_process");
-+	unshare_fs_struct();
- 
- 	rc = lu_env_init(&env, LCT_LOCAL);
- 	if (rc)
 diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
 index 3736410..8d53834 100644
 --- a/lustre/osd-ldiskfs/osd_scrub.c
@@ -2788,65 +2778,6 @@ index 669b0d7..b6486e0 100644
  #else
          pc->pc_wait_callback =
                  liblustre_register_wait_callback("ptlrpcd_check_async_rpcs",
-diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
-index dee77cd..7b5738f 100644
---- a/lustre/ptlrpc/recov_thread.c
-+++ b/lustre/ptlrpc/recov_thread.c
-@@ -513,10 +513,11 @@ EXPORT_SYMBOL(llog_recov_thread_fini);
- static int llog_recov_thread_replay(struct llog_ctxt *ctxt,
-                                     void *cb, void *arg)
- {
--        struct obd_device *obd = ctxt->loc_obd;
--        struct llog_process_cat_args *lpca;
--        int rc;
--        ENTRY;
-+	struct obd_device *obd = ctxt->loc_obd;
-+	struct llog_process_cat_args *lpca;
-+	cfs_task_t *task;
-+	int rc;
-+	ENTRY;
- 
-         if (obd->obd_stopping)
-                 RETURN(-ENODEV);
-@@ -534,22 +535,23 @@ static int llog_recov_thread_replay(struct llog_ctxt *ctxt,
-         /*
-          * This will be balanced in llog_cat_process_thread()
-          */
--        lpca->lpca_ctxt = llog_ctxt_get(ctxt);
--        if (!lpca->lpca_ctxt) {
--                OBD_FREE_PTR(lpca);
--                RETURN(-ENODEV);
--        }
--        rc = cfs_create_thread(llog_cat_process_thread, lpca, CFS_DAEMON_FLAGS);
--        if (rc < 0) {
--                CERROR("Error starting llog_cat_process_thread(): %d\n", rc);
--                OBD_FREE_PTR(lpca);
--                llog_ctxt_put(ctxt);
--        } else {
--                CDEBUG(D_HA, "Started llog_cat_process_thread(): %d\n", rc);
--                rc = 0;
--        }
-+	lpca->lpca_ctxt = llog_ctxt_get(ctxt);
-+	if (!lpca->lpca_ctxt) {
-+		OBD_FREE_PTR(lpca);
-+		RETURN(-ENODEV);
-+	}
-+	task = kthread_run(llog_cat_process_thread, lpca, "ll_log_process");
-+	if (IS_ERR(task)) {
-+		rc = PTR_ERR(task);
-+		CERROR("Error starting llog_cat_process_thread(): %d\n", rc);
-+		OBD_FREE_PTR(lpca);
-+		llog_ctxt_put(ctxt);
-+	} else {
-+		CDEBUG(D_HA, "Started llog_cat_process_thread()\n");
-+		rc = 0;
-+	}
- 
--        RETURN(rc);
-+	RETURN(rc);
- }
- 
- int llog_obd_repl_connect(struct llog_ctxt *ctxt,
 diff --git a/lustre/ptlrpc/sec_gc.c b/lustre/ptlrpc/sec_gc.c
 index 7634d22..595f710 100644
 --- a/lustre/ptlrpc/sec_gc.c

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 de4c649..0055d26 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 c38a8fce9d43a0b188360d504adc3cac7ae775c4 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/8] LU-2987 llite: rcu-free inode
+Subject: [PATCH 7/7] LU-2987 llite: rcu-free inode
 
 Since 2.6.38, inode.i_rcu was added and file system .destory_inode
 should rcu-free inodes.
@@ -14,7 +14,7 @@ Change-Id: Idc12c94fd1bf9c99756c9bcb2d07f3061e6dad5a
  2 files changed, 37 insertions(+), 2 deletions(-)
 
 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index 3e4bfdc..78dbe99 100644
+index d736343..4e90e86 100644
 --- a/lustre/autoconf/lustre-core.m4
 +++ b/lustre/autoconf/lustre-core.m4
 @@ -1682,6 +1682,26 @@ LB_LINUX_TRY_COMPILE([
@@ -44,7 +44,7 @@ index 3e4bfdc..78dbe99 100644
  # 2.6.38 export blkdev_get_by_dev
  #
  AC_DEFUN([LC_BLKDEV_GET_BY_DEV],
-@@ -2389,6 +2409,7 @@ AC_DEFUN([LC_PROG_LINUX],
+@@ -2408,6 +2428,7 @@ AC_DEFUN([LC_PROG_LINUX],
           LC_GENERIC_PERMISSION
           LC_QUOTA_ON_USE_PATH
           LC_DCACHE_LOCK

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/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
similarity index 100%
rename from sys-cluster/lustre/files/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch
rename to sys-cluster/lustre/files/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch

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
deleted file mode 100644
index 04603cf..0000000
--- a/sys-cluster/lustre/files/0008-LU-2929-build-fix-unused-uninitilized-virables-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f18c8e7cd37a4208fd5c96e149d78c7249edb7e2 Mon Sep 17 00:00:00 2001
-From: James Simmons <uja.ornl@×××××.com>
-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 <tao.peng@×××.com>
-Signed-off-by: James Simmons <uja.ornl@×××××.com>
-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/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index 9a93eff..48ce0cf 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -31,15 +31,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/0000-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch"
-	"${FILESDIR}/0001-LU-2850-build-check-header-files-in-generated-uapi-d.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-libcfs-use-sock_alloc_file-instead-of-sock_m.patch"
-	"${FILESDIR}/0004-LU-2800-llite-introduce-local-getname.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-2929-build-fix-unused-uninitilized-virables-error.patch"
-	"${FILESDIR}/0009-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch"
+	"${FILESDIR}/0008-LU-2850-kernel-3.9-hlist_for_each_entry-uses-3-args.patch"
 )
 
 pkg_setup() {