14 files changed, 40 insertions, 53 deletions
diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 53b8be5ce..dc604d084 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -3,6 +3,34 @@
 # $Header: $
 
   12 Feb 2014; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  +files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch,
+  +files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch,
+  +files/0004-LU-3319-procfs-fix-symlink-handling.patch,
+  +files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch,
+  +files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch,
+  +files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch,
+  +files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch,
+  +files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch,
+  +files/0010-LU-3319-lprocfs-client-side-cleanups.patch,
+  +files/0011-LU-3974-llite-use-new-struct-dir_context.patch,
+  +files/0012-LU-3974-llite-invalidatepage-api-changed.patch,
+  -files/0001-LU-4554-lfsck-old-single-OI-MDT-always-scrubbed.patch,
+  -files/0002-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  -files/0003-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch,
+  -files/0004-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch,
+  -files/0005-LU-3319-procfs-fix-symlink-handling.patch,
+  -files/0006-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch,
+  -files/0007-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch,
+  -files/0008-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch,
+  -files/0009-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch,
+  -files/0010-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch,
+  -files/0011-LU-3319-lprocfs-client-side-cleanups.patch,
+  -files/0012-LU-3974-llite-use-new-struct-dir_context.patch,
+  -files/0013-LU-3974-llite-invalidatepage-api-changed.patch:
+  Drop unneded patch
+
+  12 Feb 2014; Alexey Shvetsov <alexxy@gentoo.org>
   +files/0001-LU-4554-lfsck-old-single-OI-MDT-always-scrubbed.patch,
   +files/0002-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
   +files/0003-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch,
diff --git a/sys-cluster/lustre/files/0002-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
index f6b096528..caa6587f5 100644
--- a/sys-cluster/lustre/files/0002-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,7 @@
 From 247c87f4a981fd26bfaf219930193b1a35865736 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@gentoo.org>
 Date: Mon, 18 Mar 2013 16:22:27 +0400
-Subject: [PATCH 02/13] LU-2982 build: make AC check for linux arch sandbox
+Subject: [PATCH 01/12] LU-2982 build: make AC check for linux arch sandbox
  friendly
 
 this commit makes AC check for linux kernel arch sandbox friendly
diff --git a/sys-cluster/lustre/files/0001-LU-4554-lfsck-old-single-OI-MDT-always-scrubbed.patch b/sys-cluster/lustre/files/0001-LU-4554-lfsck-old-single-OI-MDT-always-scrubbed.patch
deleted file mode 100644
index 18ec7cfe8..000000000
--- a/sys-cluster/lustre/files/0001-LU-4554-lfsck-old-single-OI-MDT-always-scrubbed.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9e3436c298d65a5867920b0de0d3920972465407 Mon Sep 17 00:00:00 2001
-From: Ned Bass <bass6@llnl.gov>
-Date: Thu, 30 Jan 2014 14:56:20 -0800
-Subject: [PATCH 01/13] LU-4554 lfsck: old single-OI MDT always scrubbed
-
-Old ldiskfs MDT's that contain a single OI container named "oi.16"
-trigger an automatic OI scrub on each restart.  This is because
-osd_oi_table_open() gets ENOENT opening "oi.16.0" and consequently
-sets bit 0 in scrub_file::sf_oi_bitmap.  This bit indicates the OI
-container 0 needs to be recreated, and it triggers a scrub in
-osd_fid_lookup() for lookups that fail with ENOENT.  Fix this by
-clearing the bit in osd_oi_init() after a successful open of
-"oi.16".
-
-Signed-off-by: Ned Bass <bass6@llnl.gov>
-Change-Id: Ie69223d3f8289c90de46f9afe0a2de0e0625b0f6
-Reviewed-on: http://review.whamcloud.com/9067
-Tested-by: Jenkins
-Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
-Tested-by: Maloo <hpdd-maloo@intel.com>
-Reviewed-by: James Nunez <james.a.nunez@intel.com>
-Reviewed-by: Fan Yong <fan.yong@intel.com>
----
- lustre/osd-ldiskfs/osd_oi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
-index 6e690be..b4bfb9a 100644
---- a/lustre/osd-ldiskfs/osd_oi.c
-+++ b/lustre/osd-ldiskfs/osd_oi.c
-@@ -368,6 +368,7 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
- 	/* if previous failed then try found single OI from old filesystem */
- 	rc = osd_oi_open(info, osd, OSD_OI_NAME_BASE, &oi[0], false);
- 	if (rc == 0) { /* found single OI from old filesystem */
-+		ldiskfs_clear_bit(0, sf->sf_oi_bitmap);
- 		if (sf->sf_success_count == 0)
- 			/* XXX: There is one corner case that if the OI_scrub
- 			 *	file crashed or lost and we regard it upgrade,
--- 
-1.8.5.3
-
diff --git a/sys-cluster/lustre/files/0003-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
index a93c92a15..939f1fcc1 100644
--- a/sys-cluster/lustre/files/0003-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0002-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch
@@ -1,7 +1,7 @@
 From c05c0be01814527d8d3762963c7a6d4c28189d2d Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Fri, 3 Jan 2014 09:55:26 -0500
-Subject: [PATCH 03/13] LU-3319 procfs: update zfs proc handling to seq_files
+Subject: [PATCH 02/12] LU-3319 procfs: update zfs proc handling to seq_files
 
 Migrate all zfs proc handling to using strictly seq_files.
 
diff --git a/sys-cluster/lustre/files/0004-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
index fe3241142..756975ee9 100644
--- a/sys-cluster/lustre/files/0004-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0003-LU-3319-procfs-move-mgs-proc-handling-to-seq_files.patch
@@ -1,7 +1,7 @@
 From b262846027fbf96a5a80b81cfe86da53ce6e6f9f Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Fri, 3 Jan 2014 09:58:53 -0500
-Subject: [PATCH 04/13] LU-3319 procfs: move mgs proc handling to seq_files
+Subject: [PATCH 03/12] LU-3319 procfs: move mgs proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
 uses struct seq_files. This patch migrates the mgs
diff --git a/sys-cluster/lustre/files/0005-LU-3319-procfs-fix-symlink-handling.patch b/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch
index 533c4d925..fc78c68c8 100644
--- a/sys-cluster/lustre/files/0005-LU-3319-procfs-fix-symlink-handling.patch
+++ b/sys-cluster/lustre/files/0004-LU-3319-procfs-fix-symlink-handling.patch
@@ -1,7 +1,7 @@
 From 8f24a0e29b5f4b18193742c9aecd960c6b6102ff Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 09:37:44 -0500
-Subject: [PATCH 05/13] LU-3319 procfs: fix symlink handling
+Subject: [PATCH 04/12] LU-3319 procfs: fix symlink handling
 
 While working on symlink handling for seq files I noticed a
 long outstanding bug. Code was developed to link osc obds
diff --git a/sys-cluster/lustre/files/0006-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
index 0ff28fd65..7734600ca 100644
--- a/sys-cluster/lustre/files/0006-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0005-LU-3319-procfs-move-osp-proc-handling-to-seq_files.patch
@@ -1,7 +1,7 @@
 From cfafe91ff9caf648f144c1a162112b7d1485aae4 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 17:10:18 -0500
-Subject: [PATCH 06/13] LU-3319 procfs: move osp proc handling to seq_files
+Subject: [PATCH 05/12] LU-3319 procfs: move osp proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
 uses struct seq_files. This patch migrates the osp
diff --git a/sys-cluster/lustre/files/0007-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch b/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
index dad3b481c..1ca6b125d 100644
--- a/sys-cluster/lustre/files/0007-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
+++ b/sys-cluster/lustre/files/0006-LU-3319-procfs-move-lod-proc-handling-to-seq_files.patch
@@ -1,7 +1,7 @@
 From 82953bddbc3c7b9aa044d9eecc796bc12638f476 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 11:08:45 -0500
-Subject: [PATCH 07/13] LU-3319 procfs: move lod proc handling to seq_files
+Subject: [PATCH 06/12] LU-3319 procfs: move lod proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
 uses struct seq_files. This patch migrates the lod
diff --git a/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch b/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
index 4019ae50c..0e748e6cc 100644
--- a/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
+++ b/sys-cluster/lustre/files/0007-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch
@@ -1,7 +1,7 @@
 From 2790709429e9aaf4b11fca12e3f2e9d70f6608ce Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Fri, 31 Jan 2014 14:00:32 -0500
-Subject: [PATCH 08/13] LU-3319 procfs: move mdd/ofd proc handling to seq_files
+Subject: [PATCH 07/12] LU-3319 procfs: move mdd/ofd proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
 uses struct seq_files. This patch migrates the mdd/ofd
diff --git a/sys-cluster/lustre/files/0009-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch b/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
index febec325b..a6a425b5b 100644
--- a/sys-cluster/lustre/files/0009-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
+++ b/sys-cluster/lustre/files/0008-LU-3319-procfs-move-mdt-mds-proc-handling-to-seq_fil.patch
@@ -1,7 +1,7 @@
 From 1013b4b997343de8530c4d4ef5380220d57f155a Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 11:04:31 -0500
-Subject: [PATCH 09/13] LU-3319 procfs: move mdt/mds proc handling to seq_files
+Subject: [PATCH 08/12] LU-3319 procfs: move mdt/mds proc handling to seq_files
 
 With 3.10 linux kernel and above proc handling now only
 uses struct seq_files. This patch migrates the mdt/mds
diff --git a/sys-cluster/lustre/files/0010-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch b/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
index 0be7f2aaf..97b8e0e74 100644
--- a/sys-cluster/lustre/files/0010-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
+++ b/sys-cluster/lustre/files/0009-LU-3319-procfs-update-ldiskfs-proc-handling-to-seq_f.patch
@@ -1,7 +1,7 @@
 From adf3be9fe382564c4760b83a5843b7d5502bbe48 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Sun, 9 Feb 2014 10:45:37 -0500
-Subject: [PATCH 10/13] LU-3319 procfs: update ldiskfs proc handling to
+Subject: [PATCH 09/12] LU-3319 procfs: update ldiskfs proc handling to
  seq_files
 
 Migrate all ldiskfs proc handling to using strictly
diff --git a/sys-cluster/lustre/files/0011-LU-3319-lprocfs-client-side-cleanups.patch b/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch
index b3ff994d1..1eed584b6 100644
--- a/sys-cluster/lustre/files/0011-LU-3319-lprocfs-client-side-cleanups.patch
+++ b/sys-cluster/lustre/files/0010-LU-3319-lprocfs-client-side-cleanups.patch
@@ -1,7 +1,7 @@
 From cd81037fa6ecc7f6b36d3c49205a3d6f3e7aa0de Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Tue, 21 Jan 2014 12:06:59 -0500
-Subject: [PATCH 11/13] LU-3319 lprocfs: client side cleanups
+Subject: [PATCH 10/12] LU-3319 lprocfs: client side cleanups
 
 Now that all the client side seq_file patches it is
 time to handle the issue that people pointed out but
diff --git a/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch b/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch
index 7a5b843e3..c2ca77147 100644
--- a/sys-cluster/lustre/files/0012-LU-3974-llite-use-new-struct-dir_context.patch
+++ b/sys-cluster/lustre/files/0011-LU-3974-llite-use-new-struct-dir_context.patch
@@ -1,7 +1,7 @@
 From da6a877ec27753ce11499d1bde68d392f90179c4 Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Mon, 20 Jan 2014 21:23:00 -0500
-Subject: [PATCH 12/13] LU-3974 llite: use new struct dir_context
+Subject: [PATCH 11/12] LU-3974 llite: use new struct dir_context
 
 The readdir and nfs code over time has added more
 parameters to be passed to be processed. For the 3.11
diff --git a/sys-cluster/lustre/files/0013-LU-3974-llite-invalidatepage-api-changed.patch b/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch
index ccca80629..63a3ec3e5 100644
--- a/sys-cluster/lustre/files/0013-LU-3974-llite-invalidatepage-api-changed.patch
+++ b/sys-cluster/lustre/files/0012-LU-3974-llite-invalidatepage-api-changed.patch
@@ -1,7 +1,7 @@
 From 4e78aa55c404914cdc2d01060fb73fc1b0a6b63e Mon Sep 17 00:00:00 2001
 From: James Simmons <uja.ornl@gmail.com>
 Date: Tue, 24 Sep 2013 12:29:47 -0400
-Subject: [PATCH 13/13] LU-3974 llite: invalidatepage api changed
+Subject: [PATCH 12/12] LU-3974 llite: invalidatepage api changed
 
 Until recently invalidating pages from the buffer cache
 was dependent only on the page passed in and the start